From 8e82ae46fd7eecc2425ed55cd06c6738d31ab1ef Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Mon, 7 Oct 2024 02:17:32 +0000 Subject: [PATCH 1/6] Upgrade macOS runner image to macOS 13 Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6daa18..a6ad1da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: strategy: matrix: - os: [ubuntu-22.04, macos-12, windows-2022] + os: [ubuntu-22.04, macos-13, windows-2022] steps: - uses: actions/setup-go@v4 @@ -76,7 +76,7 @@ jobs: strategy: matrix: - os: [ubuntu-22.04, macos-12, windows-2022] + os: [ubuntu-22.04, macos-13, windows-2022] steps: - uses: actions/checkout@v2 From 608b83c69071e34c689a7174d439a700a5b10aa8 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Mon, 7 Oct 2024 02:23:12 +0000 Subject: [PATCH 2/6] Upgrade to actions/setup-go@v5 Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6ad1da..2ee9a85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: os: [ubuntu-22.04, macos-13, windows-2022] steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} cache: false # see actions/setup-go#368 @@ -54,7 +54,7 @@ jobs: timeout-minutes: 5 steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} cache: false # see actions/setup-go#368 @@ -83,7 +83,7 @@ jobs: with: path: src/github.com/containerd/errdefs - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} From 908b04b90d2a8dd2127469ebb66fb9dd60a780c5 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Mon, 7 Oct 2024 02:24:12 +0000 Subject: [PATCH 3/6] Upgrade to actions/checkout@v4 Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ee9a85..2ae7ce3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: go-version: ${{ env.GO_VERSION }} cache: false # see actions/setup-go#368 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: golangci/golangci-lint-action@v3 with: version: v1.52.2 @@ -59,7 +59,7 @@ jobs: go-version: ${{ env.GO_VERSION }} cache: false # see actions/setup-go#368 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: src/github.com/containerd/errdefs fetch-depth: 25 @@ -79,7 +79,7 @@ jobs: os: [ubuntu-22.04, macos-13, windows-2022] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: src/github.com/containerd/errdefs From ffe5586c0581f6744ddebe87a82ca6f75bb0da78 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Mon, 7 Oct 2024 02:25:22 +0000 Subject: [PATCH 4/6] Upgrade to golangci/golangci-lint-action@v6 Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ae7ce3..e218abd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: cache: false # see actions/setup-go#368 - uses: actions/checkout@v4 - - uses: golangci/golangci-lint-action@v3 + - uses: golangci/golangci-lint-action@v6 with: version: v1.52.2 skip-cache: true From e70104e29d6783e914cbe12e7aeb6c6600d0d0a2 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Mon, 7 Oct 2024 02:25:48 +0000 Subject: [PATCH 5/6] Upgrade to golangci-lint@v1.61.0 Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e218abd..a06cb9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@v4 - uses: golangci/golangci-lint-action@v6 with: - version: v1.52.2 + version: v1.61.0 skip-cache: true args: --timeout=5m From 303a6ea6abfdcbc4ba2b8bf44c1af25a5831caea Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Mon, 7 Oct 2024 02:30:10 +0000 Subject: [PATCH 6/6] Update to Go 1.22.8 in CI Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a06cb9c..84f6115 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: env: # Go version we currently use to build containerd across all CI. # Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions. - GO_VERSION: "1.21.0" + GO_VERSION: "1.22.8" permissions: # added using https://github.com/step-security/secure-workflows contents: read