Home Original page

Merge pull request #4943 from lifubang/backport-1.2-4934-4937 · opencontainers/runc@2462b68

2 files changed

lines changed

Original file line numberDiff line numberDiff line change

@@ -220,8 +220,6 @@ jobs:

220220
221221

# NOTE the execution environment lacks a terminal, needed for

222222

# some integration tests. So we use `ssh -tt` command to fake a terminal.

223-

- uses: lima-vm/lima-actions/ssh@v1

224-
225223

- name: "Run unit tests"

226224

run: ssh -tt lima-default sudo -i make -C /tmp/runc localunittest

227225
Original file line numberDiff line numberDiff line change

@@ -41,9 +41,9 @@ jobs:

4141

- uses: golangci/golangci-lint-action@v6

4242

with:

4343

version: v1.64

44-

# Extra linters, only checking new code from a pull request.

44+

# Extra linters, only checking new code from a pull request to main.

4545

- name: lint-extra

46-

if: github.event_name == 'pull_request'

46+

if: github.event_name == 'pull_request' && github.base_ref == 'main'

4747

run: |

4848

golangci-lint run --config .golangci-extra.yml --new-from-rev=HEAD~1

4949