From 322cb8c1402e661c53b1fede649f4cfeeb675e4d Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Wed, 3 Aug 2022 10:17:12 +0200 Subject: [PATCH 1/6] Upgrade golang --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eed96d4e..42ea0285 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.18 as builder +FROM golang:1.19 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/go.mod b/go.mod index 9c612e2a..b2eee985 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/evryfs/github-actions-runner-operator -go 1.18 +go 1.19 require ( github.com/go-logr/logr v1.2.3 From 655ae72dba3043f3eef9192aa780408dea74fc9c Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Wed, 3 Aug 2022 10:38:21 +0200 Subject: [PATCH 2/6] test --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d115f76e..0c2a2403 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,6 +27,7 @@ jobs: with: cache: false go-version-file: 'go.mod' + go-version: ^1.19 - name: Test and build image run: | From 879528b44d4c506d1642f0f1495c303a69bafb3f Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Wed, 3 Aug 2022 10:47:33 +0200 Subject: [PATCH 3/6] Revert "test" This reverts commit 655ae72dba3043f3eef9192aa780408dea74fc9c. --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0c2a2403..d115f76e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,7 +27,6 @@ jobs: with: cache: false go-version-file: 'go.mod' - go-version: ^1.19 - name: Test and build image run: | From 6845e307e4a0b049e4729f7044cff0d3e6a86ecb Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Wed, 3 Aug 2022 10:49:10 +0200 Subject: [PATCH 4/6] unset goroot --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d115f76e..cdcf8790 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,6 +8,7 @@ on: pull_request: env: OPERATOR_SDK_VERSION: "v1.18.1" + GOROOT: "" jobs: build: runs-on: ubuntu-latest From 212d27beefd61416513b17bacbb91e91bfd0dae3 Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Wed, 3 Aug 2022 10:55:25 +0200 Subject: [PATCH 5/6] change order --- .github/workflows/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cdcf8790..37123a2d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,16 +19,16 @@ jobs: with: fetch-depth: 0 - - name: golangci-lint - uses: reviewdog/action-golangci-lint@v2 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/setup-go@v3 with: cache: false go-version-file: 'go.mod' + - name: golangci-lint + uses: reviewdog/action-golangci-lint@v2 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + - name: Test and build image run: | make test docker-build From 7fabd82275a01659aacf203ce734d3aa1f3b3144 Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Wed, 3 Aug 2022 10:58:13 +0200 Subject: [PATCH 6/6] Revert "unset goroot" This reverts commit 6845e307e4a0b049e4729f7044cff0d3e6a86ecb. --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 37123a2d..257c801b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,7 +8,6 @@ on: pull_request: env: OPERATOR_SDK_VERSION: "v1.18.1" - GOROOT: "" jobs: build: runs-on: ubuntu-latest