From 5353069ecb3980b1de24b9339cb5e3c243aadec8 Mon Sep 17 00:00:00 2001
From: m2Giles <69128853+m2Giles@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:00:20 -0500
Subject: [PATCH] reorganize

---
 .github/workflows/reusable-build-iso.yml |  3 +--
 .github/workflows/reusable-build.yml     | 33 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
index 879950ba026..595adf9a7e3 100644
--- a/.github/workflows/reusable-build-iso.yml
+++ b/.github/workflows/reusable-build-iso.yml
@@ -46,9 +46,8 @@ jobs:
       - name: Build ISO
         shell: bash
         run: |
-          sudo cp $(which just) /usr/local/bin/just
-          sudo just build-iso-ghcr "${{ matrix.base_name }} ${{ matrix.stream_name }} ${{ matrix.image_flavor }}"
           image_name="$(just image_name ${{ matrix.base_name }} ${{ matrix.image_flavor }})"
+          sudo $(which just) build-iso-ghcr "${{ matrix.base_name }} ${{ matrix.stream_name }} ${{ matrix.image_flavor }}"
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
           echo "ISO_BUILD_DIR=${{ github.workspace }}/${image_name}_build" >> $GITHUB_ENV
           echo "ISO_NAME=${image_name}.iso" >> $GITHUB_ENV
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index c8395beb0ac..31efe4219d7 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -48,6 +48,23 @@ jobs:
       
       - name: Check just syntax
         uses: ublue-os/just-action@bda593098a84a84973b002b4377709166a68be52 # v2
+      
+      - name: Image Name
+        shell: bash
+        run: |
+          IMAGE_NAME="$(just image_name ${{ matrix.base_name }} ${{ matrix.image_flavor }})"
+          echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_ENV
+
+      - name: Maximize build space
+        uses: ublue-os/remove-unwanted-software@517622d6452028f266b7ba4cc9a123b5f58a6b53 # v7
+        with:
+          remove-codeql: true
+
+      - name: Build and Rechunk Image
+        id: build-image
+        shell: bash
+        run: |
+          sudo $(which just) build-pipeline "${{ matrix.base_name }}" "${{ matrix.stream_name }}" "${{ matrix.image_flavor }}" "${{ inputs.kernel_pin }}"
 
       - name: Generate tags
         id: generate-tags
@@ -58,7 +75,6 @@ jobs:
           TODAY="$(date +%A)"
           WEEKLY="Sunday"
           FEDORA_VERSION="$(just fedora_version ${{ matrix.base_name}} ${{ matrix.stream_name}} ${{ matrix.image_flavor}} 1)"
-          IMAGE_NAME="$(just image_name ${{ matrix.base_name }} ${{ matrix.image_flavor }})"
 
           # Arrays for Tags
           COMMIT_TAGS=()
@@ -112,22 +128,7 @@ jobs:
           fi
 
           echo "alias_tags=${alias_tags[*]}" >> $GITHUB_OUTPUT
-          echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_ENV
         
-      - name: Maximize build space
-        uses: ublue-os/remove-unwanted-software@517622d6452028f266b7ba4cc9a123b5f58a6b53 # v7
-        with:
-          remove-codeql: true
-
-      - name: Build and Rechunk Image
-        id: build-image
-        shell: bash
-        run: |
-          set -eoux pipefail
-          sudo cp $(which just) /usr/local/bin/just
-          sudo just build-pipeline "${{ matrix.base_name }}" "${{ matrix.stream_name }}" "${{ matrix.image_flavor }}" "${{ inputs.kernel_pin }}"
-          sudo rm /usr/local/bin/just
-
       # Tag Images
       - name: Tag Images
         shell: bash