From 7b9c6a195e0f05c2d5a350a75c822e6ce08db2e9 Mon Sep 17 00:00:00 2001
From: Nick Boldt <nboldt@redhat.com>
Date: Mon, 29 Jan 2024 14:42:37 -0400
Subject: [PATCH] chore: move commit check into the same job as the build as it
 seems env vars do not cross job boundaries (#174)

Signed-off-by: Nick Boldt <nboldt@redhat.com>
---
 .github/workflows/next-container-build.yaml | 41 ++++++++-------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/next-container-build.yaml b/.github/workflows/next-container-build.yaml
index c48797bf..9b058515 100644
--- a/.github/workflows/next-container-build.yaml
+++ b/.github/workflows/next-container-build.yaml
@@ -30,16 +30,21 @@ env:
   REGISTRY: quay.io
 
 jobs:
-  check-changes:
-    # check if the change for this PR necessitates a rebuild of containers
+  next-build:
+    name: Next build
     runs-on: ubuntu-latest
+    needs: check-changes
+    permissions:
+      contents: read
+      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: check-changes
-        # check changes in this commit for regex include and exclude matches; pipe to an env var
+
+      # check changes in this commit for regex include and exclude matches; pipe to an env var
+      - name: Check for changes to build
         run: |
           # don't fail if nothing returned by grep
           set +e 
@@ -56,27 +61,6 @@ jobs:
             echo EOF
           } >> "$GITHUB_ENV"
 
-  next-build:
-    name: Next build
-    runs-on: ubuntu-latest
-    needs: check-changes
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Go
-        # run this stage only if there are changes that match the includes and not the excludes
-        if: ${{ env.CHANGES != '' }}
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-
       - name: Get the last commit short SHA
         # run this stage only if there are changes that match the includes and not the excludes
         if: ${{ env.CHANGES != '' }}
@@ -86,6 +70,13 @@ jobs:
           BASE_VERSION=$(grep -E "^VERSION \?=" Makefile | sed -r -e "s/.+= //") # 0.0.1
           echo "BASE_VERSION=$BASE_VERSION" >> $GITHUB_ENV
 
+      - name: Setup Go
+        # run this stage only if there are changes that match the includes and not the excludes
+        if: ${{ env.CHANGES != '' }}
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+
       - name: Login to quay.io
         # run this stage only if there are changes that match the includes and not the excludes
         if: ${{ env.CHANGES != '' }}