pr/custom builder f40 (#1438)

* ci: custom runner option for custom build workflow call * fix: outputs --------- Signed-off-by: Cappy Ishihara <[email protected]>
terrapkg · Jul 7, 2024 · 1a6744d · 1a6744d
1 parent 42ccbc7
commit 1a6744d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,17 +19,19 @@ jobs:
     steps:
       - name: Parse Input
         id: parsing
-        run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
+        run: |
+            echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
+            echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT
 
   build:
     needs: parse
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
         version: ["40"]
-        arch: ${{ output.builder == "x86-64-lg" && ["x86_64"] || ["x86_64", "aarch64"] }}
+        arch: ${{ needs.parse.outputs.builder == "x86-64-lg" && ["x86_64"] || ["x86_64", "aarch64"] }}
       fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || output.builder && output.builder || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged