From 739039f8ff8b53e836926d4e6715d3e02c64b368 Mon Sep 17 00:00:00 2001 From: Richard Kelly Date: Tue, 18 Mar 2025 23:29:05 +0000 Subject: [PATCH 1/2] github:lock actions to commit --- .github/actions/setup-node/action.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/cache.yml | 4 ++-- .github/workflows/golangci-lint.yaml | 8 ++++---- .github/workflows/validate-changelog.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml index 501e8721f..619417647 100644 --- a/.github/actions/setup-node/action.yml +++ b/.github/actions/setup-node/action.yml @@ -5,7 +5,7 @@ runs: steps: - run: sudo apt -y install build-essential openssl libssl-dev pkg-config liblz4-tool clang shell: bash - - uses: actions/cache/restore@v4 + - uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # Restore most recent cache if available. with: path: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d94030053..2d6363ddf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: delay=$((1 + $RANDOM % 32)) echo "Waiting ${delay} seconds before execution" sleep $delay - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Preflight step to set up the runner uses: ./.github/actions/setup-node - run: rustup component add rustfmt diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index 1ecc570d1..82da954e1 100644 --- a/.github/workflows/cache.yml +++ b/.github/workflows/cache.yml @@ -18,7 +18,7 @@ jobs: permissions: actions: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # Install dependencies for twoliter and cargo-make. - run: sudo apt -y install build-essential openssl libssl-dev pkg-config liblz4-tool shell: bash @@ -47,7 +47,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} continue-on-error: true # This caches the reusable artifacts for future CI runs. - - uses: actions/cache/save@v4 + - uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # Save Rust dependencies with: path: | diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index 107d9da9b..78b82a10f 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -14,17 +14,17 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v5 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 with: go-version: 1.21 - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: lint-host-ctr - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 with: version: latest working-directory: sources/host-ctr - name: lint-ecs-gpu-init - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 with: version: latest working-directory: sources/ecs-gpu-init diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index f07e22b38..70315c199 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -9,5 +9,5 @@ jobs: validate: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: ./tools/validate-changelog.sh From feb81014af89c9f29b7eaf0aac2e041317a8f4ec Mon Sep 17 00:00:00 2001 From: Richard Kelly Date: Mon, 24 Mar 2025 23:04:54 +0000 Subject: [PATCH 2/2] host-ctr: fix lint issues --- sources/host-ctr/cmd/host-ctr/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/host-ctr/cmd/host-ctr/main.go b/sources/host-ctr/cmd/host-ctr/main.go index 2e01d5fea..0913acbba 100644 --- a/sources/host-ctr/cmd/host-ctr/main.go +++ b/sources/host-ctr/cmd/host-ctr/main.go @@ -18,13 +18,13 @@ import ( "github.com/aws/aws-sdk-go/service/ecrpublic" "github.com/awslabs/amazon-ecr-containerd-resolver/ecr" "github.com/containerd/containerd" + "github.com/containerd/containerd/api/types/runc/options" "github.com/containerd/containerd/cio" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/contrib/seccomp" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/remotes/docker" - "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/errdefs" "github.com/containerd/log" runtimespec "github.com/opencontainers/runtime-spec/specs-go"