From a467507a480d1864ff8571cc68589d1f02c377b1 Mon Sep 17 00:00:00 2001 From: justinsb Date: Thu, 9 May 2024 07:46:53 -0400 Subject: [PATCH] tests: use version from go.mod in github actions This reduces the duplication of the go version. --- .github/workflows/main.yml | 40 +++++++++++++++---------------- .github/workflows/update-deps.yml | 6 +++-- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8b189f2e3707..6dc51a96e455e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,15 +16,15 @@ jobs: build-linux-amd64: runs-on: ubuntu-20.04 steps: - - name: Set up go - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 - with: - go-version: '1.22.3' - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b with: path: ${{ env.GOPATH }}/src/k8s.io/kops + - name: Set up go + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 + with: + go-version-file: '${{ env.GOPATH }}/src/k8s.io/kops/go.mod' + - name: make all examples test working-directory: ${{ env.GOPATH }}/src/k8s.io/kops run: | @@ -33,15 +33,15 @@ jobs: build-macos-amd64: runs-on: macos-latest steps: - - name: Set up go - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 - with: - go-version: '1.22.3' - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b with: path: ${{ env.GOPATH }}/src/k8s.io/kops + - name: Set up go + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 + with: + go-version-file: '${{ env.GOPATH }}/src/k8s.io/kops/go.mod' + - name: make kops examples test working-directory: ${{ env.GOPATH }}/src/k8s.io/kops run: | @@ -50,15 +50,15 @@ jobs: build-windows-amd64: runs-on: windows-2019 steps: - - name: Set up go - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 - with: - go-version: '1.22.3' - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b with: path: ${{ env.GOPATH }}/src/k8s.io/kops + - name: Set up go + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 + with: + go-version-file: '${{ env.GOPATH }}/src/k8s.io/kops/go.mod' + - name: make kops examples test working-directory: ${{ env.GOPATH }}/src/k8s.io/kops run: | @@ -67,15 +67,15 @@ jobs: verify: runs-on: ubuntu-20.04 steps: - - name: Set up go - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 - with: - go-version: '1.22.3' - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b with: path: ${{ env.GOPATH }}/src/k8s.io/kops + - name: Set up go + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 + with: + go-version-file: '${{ env.GOPATH }}/src/k8s.io/kops/go.mod' + - name: make quick-ci working-directory: ${{ env.GOPATH }}/src/k8s.io/kops run: | diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 44560fdbd2a41..0a7bc331f64c4 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -17,10 +17,12 @@ jobs: if: ${{ github.repository == 'kubernetes/kops' }} runs-on: ubuntu-20.04 steps: + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b + - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 with: - go-version: '1.22.3' - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b + go-version-file: 'go.mod' + - name: Update Dependencies id: update_deps run: |