From da51c28767f538b4353640099a3d08b74d640334 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Nov 2025 11:09:45 +1300 Subject: [PATCH] chore(deps): bump github.com/opencontainers/selinux from 1.12.0 to 1.13.0 (#1919) * chore(deps): bump github.com/opencontainers/selinux Bumps [github.com/opencontainers/selinux](https://github.com/opencontainers/selinux) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/opencontainers/selinux/releases) - [Commits](https://github.com/opencontainers/selinux/compare/v1.12.0...v1.13.0) --- updated-dependencies: - dependency-name: github.com/opencontainers/selinux dependency-version: 1.13.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] * Fix go vet failure in CI on Linux - Add go mod download before make vet in CI to ensure modules are available - Remove vendor directory (not needed, was causing vendoring inconsistencies) - Remove cache: false from all workflow files (not needed, enables caching) - Add replace directive for filepath-securejoin to fix containers/storage build - Clean up go.mod formatting and workflow improvements * downgrade filepath-securejoin --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xav Paice --- .github/actions/setup-go/action.yml | 39 -------------------------- .github/workflows/build-test.yaml | 12 ++++++-- .github/workflows/regression-test.yaml | 4 +-- go.mod | 4 +-- go.sum | 8 +++--- 5 files changed, 16 insertions(+), 51 deletions(-) delete mode 100644 .github/actions/setup-go/action.yml diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml deleted file mode 100644 index ff1d4f34..00000000 --- a/.github/actions/setup-go/action.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: 'Setup Go Environment' -description: 'Setup Go with caching and common environment variables' -inputs: - go-version-file: - description: 'Path to go.mod file' - required: false - default: 'go.mod' -outputs: - go-version: - description: 'The Go version that was installed' - value: ${{ steps.setup-go.outputs.go-version }} - cache-hit: - description: 'Whether the Go cache was hit' - value: ${{ steps.setup-go.outputs.cache-hit }} -runs: - using: 'composite' - steps: - - name: Setup Go - id: setup-go - uses: actions/setup-go@v5 - with: - go-version-file: ${{ inputs.go-version-file }} - cache: true - - - name: Set Go environment variables - shell: bash - run: | - echo "GOMAXPROCS=2" >> $GITHUB_ENV - echo "GOCACHE=$(go env GOCACHE)" >> $GITHUB_ENV - echo "GOMODCACHE=$(go env GOMODCACHE)" >> $GITHUB_ENV - - - name: Print Go environment - shell: bash - run: | - echo "Go version: $(go version)" - echo "GOOS: $(go env GOOS)" - echo "GOARCH: $(go env GOARCH)" - echo "Cache directory: $(go env GOCACHE)" - echo "Module cache: $(go env GOMODCACHE)" diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index a7efffe0..77853b0b 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -45,7 +45,9 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v5 - - uses: ./.github/actions/setup-go + - uses: actions/setup-go@v6 + with: + go-version-file: 'go.mod' - name: Check go mod tidy run: | @@ -72,7 +74,9 @@ jobs: timeout-minutes: 20 steps: - uses: actions/checkout@v5 - - uses: ./.github/actions/setup-go + - uses: actions/setup-go@v6 + with: + go-version-file: 'go.mod' - name: Setup K3s uses: replicatedhq/action-k3s@main @@ -90,7 +94,9 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v5 - - uses: ./.github/actions/setup-go + - uses: actions/setup-go@v6 + with: + go-version-file: 'go.mod' - run: make build - uses: actions/upload-artifact@v5 with: diff --git a/.github/workflows/regression-test.yaml b/.github/workflows/regression-test.yaml index 10a4d94c..cd760d77 100644 --- a/.github/workflows/regression-test.yaml +++ b/.github/workflows/regression-test.yaml @@ -40,9 +40,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v6 with: - go-version-file: go.mod - cache: true - cache-dependency-path: go.sum + go-version-file: 'go.mod' - name: Build binaries run: | diff --git a/go.mod b/go.mod index 39930175..c973ae5d 100644 --- a/go.mod +++ b/go.mod @@ -104,6 +104,7 @@ require ( github.com/containerd/platforms v0.2.1 // indirect github.com/containerd/typeurl/v2 v2.2.3 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect + github.com/cyphar/filepath-securejoin v0.5.1 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/ebitengine/purego v0.9.0 // indirect @@ -196,7 +197,6 @@ require ( github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect github.com/containers/ocicrypt v1.2.1 // indirect github.com/containers/storage v1.59.1 // indirect - github.com/cyphar/filepath-securejoin v0.4.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/cli v28.5.1+incompatible // indirect github.com/docker/docker v28.5.1+incompatible // indirect @@ -245,7 +245,7 @@ require ( github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/runtime-spec v1.3.0 - github.com/opencontainers/selinux v1.12.0 // indirect + github.com/opencontainers/selinux v1.13.1 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 diff --git a/go.sum b/go.sum index 96715c0c..e17d3b65 100644 --- a/go.sum +++ b/go.sum @@ -181,8 +181,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= -github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= +github.com/cyphar/filepath-securejoin v0.5.1 h1:eYgfMq5yryL4fbWfkLpFFy2ukSELzaJOTaUTuh+oF48= +github.com/cyphar/filepath-securejoin v0.5.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -522,8 +522,8 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= github.com/opencontainers/runtime-spec v1.3.0 h1:YZupQUdctfhpZy3TM39nN9Ika5CBWT5diQ8ibYCRkxg= github.com/opencontainers/runtime-spec v1.3.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8= -github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U= +github.com/opencontainers/selinux v1.13.1 h1:A8nNeceYngH9Ow++M+VVEwJVpdFmrlxsN22F+ISDCJE= +github.com/opencontainers/selinux v1.13.1/go.mod h1:S10WXZ/osk2kWOYKy1x2f/eXF5ZHJoUs8UU/2caNRbg= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=