diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61eb3555557..af257e75743 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,9 +88,7 @@ jobs: with: name: build path: bin - - run: | - chmod -R +x bin - sudo rm /etc/containers/storage.conf + - run: chmod -R +x bin - run: | sudo -E make docs-generation hack/tree_status.sh @@ -104,9 +102,7 @@ jobs: with: name: build path: bin - - run: | - chmod -R +x bin - sudo rm /etc/containers/storage.conf + - run: chmod -R +x bin - run: | sudo -E make completions-generation hack/tree_status.sh diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index c3bb5ae0a6d..ee02ce7aa6b 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -23,13 +23,11 @@ jobs: - uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} + - run: scripts/github-actions-packages - uses: golangci/golangci-lint-action@v3 with: version: v1.50.1 - # Only show new issues for a pull request. - only-new-issues: true - shellcheck: runs-on: ubuntu-latest steps: diff --git a/.golangci.yml b/.golangci.yml index efc6e190ce5..5a7386b93e3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -59,6 +59,7 @@ linters: - tenv - testableexamples - tparallel + - typecheck - unconvert - unparam - unused @@ -101,7 +102,6 @@ linters: # - tagliatelle # - testpackage # - thelper - # - typecheck # - varnamelen # - wastedassign # - wrapcheck diff --git a/internal/factory/container/container.go b/internal/factory/container/container.go index e9e8165a4f1..195842fff1c 100644 --- a/internal/factory/container/container.go +++ b/internal/factory/container/container.go @@ -154,6 +154,8 @@ func New() (Container, error) { } // SpecAddMount adds a specified mount to the spec +// +//nolint:gocritic // passing the spec mount around here is intentional func (c *container) SpecAddMount(r rspec.Mount) { c.spec.RemoveMount(r.Destination) c.spec.AddMount(r) diff --git a/scripts/github-actions-packages b/scripts/github-actions-packages index 1fc3290a4c3..aa5e64c1ee1 100755 --- a/scripts/github-actions-packages +++ b/scripts/github-actions-packages @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -CRIU_REPO="https://download.opensuse.org/repositories/devel:/tools:/criu/xUbuntu_20.04" +CRIU_REPO="https://download.opensuse.org/repositories/devel:/tools:/criu/xUbuntu_22.04" curl -fSsl $CRIU_REPO/Release.key | sudo apt-key add - echo "deb $CRIU_REPO/ /" | sudo tee /etc/apt/sources.list.d/criu.list