From c9972a20808853265df19d30aaf26ead6ae33141 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Mon, 11 Sep 2023 12:09:42 +0200 Subject: [PATCH 1/3] Bump runners from ubuntu-20.04 to ubuntu-22.04 Signed-off-by: Marco Franssen --- .github/workflows/example.yml | 2 +- .github/workflows/golang.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml index 9fcb1df..2805b38 100644 --- a/.github/workflows/example.yml +++ b/.github/workflows/example.yml @@ -18,7 +18,7 @@ jobs: target: [vault] name: Check module ${{ matrix.target }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository diff --git a/.github/workflows/golang.yml b/.github/workflows/golang.yml index 7275a18..112f474 100644 --- a/.github/workflows/golang.yml +++ b/.github/workflows/golang.yml @@ -12,7 +12,7 @@ permissions: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: Continuous Integration @@ -66,7 +66,7 @@ jobs: release: name: release needs: [build] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: container_digest: ${{ steps.container_info.outputs.container_digest }} @@ -145,7 +145,7 @@ jobs: provenance: name: Generate provenance - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [release] if: startsWith(github.ref, 'refs/tags/') @@ -188,7 +188,7 @@ jobs: name: container-provenance needs: [release] if: startsWith(github.ref, 'refs/tags/') - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: From 430e7d0f6aed0255d232c0fe566bf55f6f932efb Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Mon, 11 Sep 2023 12:17:34 +0200 Subject: [PATCH 2/3] Remove caching action as this is integrated in setup-go Signed-off-by: Marco Franssen --- .github/workflows/golang.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/golang.yml b/.github/workflows/golang.yml index 112f474..a821c70 100644 --- a/.github/workflows/golang.yml +++ b/.github/workflows/golang.yml @@ -26,15 +26,6 @@ jobs: go-version-file: go.mod check-latest: true - - name: Cache Go modules - uses: actions/cache@v3.3.1 - id: go-mod-cache - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - - name: Get dependencies run: go mod download From 52216bd8c1307d4cd34b4aa8d71eeb3e721e7fa1 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Mon, 11 Sep 2023 12:23:29 +0200 Subject: [PATCH 3/3] Fix terraform formatting Signed-off-by: Marco Franssen --- example/vault/environments/local/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/vault/environments/local/versions.tf b/example/vault/environments/local/versions.tf index 63d99e1..ac02ff3 100644 --- a/example/vault/environments/local/versions.tf +++ b/example/vault/environments/local/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { vault = { - source = "hashicorp/vault" + source = "hashicorp/vault" version = "~> 3.20.0" } }