From 57e8dedc86320ca9f1fd9c507e41c00687d6d8ce Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Tue, 26 Mar 2024 10:48:33 -0400 Subject: [PATCH] use Go version from go.mod --- .github/workflows/codeql.yml | 3 ++- .github/workflows/fablab-db-creation.yml | 5 +++-- .github/workflows/golangci-lint.yml | 7 ++++--- .github/workflows/main.yml | 14 +++++++------- .github/workflows/release-quickstart.yml | 6 ++++++ .github/workflows/test-quickstart.yml | 2 +- .github/workflows/update-dependency.yml | 2 +- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0bd26ec75..3c1d80454 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -46,9 +46,10 @@ jobs: uses: actions/checkout@v4 - name: Install Go + id: setup-go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/fablab-db-creation.yml b/.github/workflows/fablab-db-creation.yml index 1aa1ab31d..639cffa83 100644 --- a/.github/workflows/fablab-db-creation.yml +++ b/.github/workflows/fablab-db-creation.yml @@ -26,10 +26,11 @@ jobs: with: path: ziti - - name: Set up Go + - name: Install Go + id: setup-go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Ziti CI uses: openziti/ziti-ci@v1 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index b71f1cc34..f9960298c 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -16,12 +16,13 @@ jobs: name: lint runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 + - name: Install Go + id: setup-go uses: actions/setup-go@v5 with: - go-version: '1.22.x' - - - uses: actions/checkout@v4 + go-version-file: ./go.mod - name: golangci-lint uses: golangci/golangci-lint-action@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e55969948..65ac41695 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -80,7 +80,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -111,7 +111,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -147,7 +147,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -178,7 +178,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -301,7 +301,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Ziti CI uses: openziti/ziti-ci@v1 @@ -416,7 +416,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Python uses: actions/setup-python@v5 diff --git a/.github/workflows/release-quickstart.yml b/.github/workflows/release-quickstart.yml index 5d60e5b7d..c1ed7f739 100644 --- a/.github/workflows/release-quickstart.yml +++ b/.github/workflows/release-quickstart.yml @@ -46,6 +46,12 @@ jobs: - name: Checkout Workspace uses: actions/checkout@v4 + - name: Install Go + id: setup-go + uses: actions/setup-go@v5 + with: + go-version-file: ./go.mod + - name: Install Ziti CI uses: openziti/ziti-ci@v1 diff --git a/.github/workflows/test-quickstart.yml b/.github/workflows/test-quickstart.yml index bb622b378..6e57205fb 100644 --- a/.github/workflows/test-quickstart.yml +++ b/.github/workflows/test-quickstart.yml @@ -33,7 +33,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Build and run a quickstart container image shell: bash diff --git a/.github/workflows/update-dependency.yml b/.github/workflows/update-dependency.yml index 8c351d5e0..0aba790d3 100644 --- a/.github/workflows/update-dependency.yml +++ b/.github/workflows/update-dependency.yml @@ -21,7 +21,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22.x' + go-version-file: ./go.mod - name: Install Ziti CI uses: openziti/ziti-ci@v1