Merge pull request etcd-io#16088 from jmhbnz/backport-gover-simplific…

…ation [3.5] Backport .github/workflows: Read .go-version as a step and not separate workflow
jmhbnz · Jun 16, 2023 · 2c04d51 · 2c04d51
2 parents cf00c2d + b5f07c9
commit 2c04d51
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 41 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -1,11 +1,8 @@
 name: E2E
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   test:
     runs-on: ubuntu-latest
-    needs: goversion
     strategy:
       fail-fast: true
       matrix:
@@ -14,9 +11,11 @@ jobs:
         - linux-386-e2e
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: date
     - env:
         TARGET: ${{ matrix.target }}

diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml
@@ -1,21 +1,20 @@
 name: functional-tests
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   test:
     runs-on: ubuntu-latest
-    needs: goversion
     strategy:
       fail-fast: true
       matrix:
         target:
         - linux-amd64-functional
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: date
     - env:
         TARGET: ${{ matrix.target }}

diff --git a/.github/workflows/go-version.yaml b/.github/workflows/go-version.yaml
diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml
@@ -1,21 +1,20 @@
 name: grpcProxy-tests
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   test:
     runs-on: ubuntu-latest
-    needs: goversion
     strategy:
       fail-fast: true
       matrix:
         target:
         - linux-amd64-grpcproxy
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: date
     - env:
         TARGET: ${{ matrix.target }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,16 +1,15 @@
 name: Release
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   main:
     runs-on: ubuntu-latest
-    needs: goversion
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - name: release
       run: |
         set -euo pipefail

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -1,11 +1,8 @@
 name: Tests
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   test:
     runs-on: ubuntu-latest
-    needs: goversion
     strategy:
       fail-fast: false
       matrix:
@@ -19,9 +16,11 @@ jobs:
         - linux-386-unit-1-cpu
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: date
     - env:
         TARGET: ${{ matrix.target }}