From e1c93750c1e5ec053313c3e8a18c3daf71b83a84 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 14 Aug 2024 23:42:15 -0700 Subject: [PATCH 1/2] cmd/oci-runtime-tool: fix govet warning Found by golangci-lint v1.60.1: cmd/oci-runtime-tool/main.go:59:17: printf: non-constant format string in call to github.com/sirupsen/logrus.Fatalf (govet) logrus.Fatalf(err.Error()) ^ Signed-off-by: Kir Kolyshkin --- cmd/oci-runtime-tool/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/oci-runtime-tool/main.go b/cmd/oci-runtime-tool/main.go index 11cdc9f65..0efa32a55 100644 --- a/cmd/oci-runtime-tool/main.go +++ b/cmd/oci-runtime-tool/main.go @@ -56,7 +56,7 @@ func before(context *cli.Context) error { logLevelString := context.GlobalString("log-level") logLevel, err := logrus.ParseLevel(logLevelString) if err != nil { - logrus.Fatalf(err.Error()) + logrus.Fatal(err) } logrus.SetLevel(logLevel) From 4c69808f8ce7fa4c15d649c3837ffefa843a98d7 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 14 Aug 2024 23:43:08 -0700 Subject: [PATCH 2/2] ci: bump Go and github actions Go 1.23 is released, making Go 1.21 (and older version) unsupported. Yet, let's also keep the version from go.mod. Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9d76885d7..54d3cd2a4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,15 +11,15 @@ on: jobs: lint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: - go-version: 1.20.x - - uses: actions/checkout@v3 - - uses: golangci/golangci-lint-action@v3 + go-version: 1.x # latest + - uses: actions/checkout@v4 + - uses: golangci/golangci-lint-action@v6 with: - version: v1.51.2 + version: v1.61 commit: runs-on: ubuntu-22.04 @@ -44,14 +44,14 @@ jobs: strategy: fail-fast: false matrix: - go-version: [1.19.x, 1.20.x] + go-version: [1.19.x, 1.22.x, 1.23.x] race: ["-race", ""] steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install go ${{ matrix.go-version }} - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: build