From 37fed685dd206ab813fc88e28210c0ff33545f48 Mon Sep 17 00:00:00 2001
From: Eric Wyles <23637493+ericwyles@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:35:51 -0500
Subject: [PATCH] conditionals on runner arch

---
 .github/workflows/ewyles-testing-arm.yaml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ewyles-testing-arm.yaml b/.github/workflows/ewyles-testing-arm.yaml
index 0ae5267e..d74cc692 100644
--- a/.github/workflows/ewyles-testing-arm.yaml
+++ b/.github/workflows/ewyles-testing-arm.yaml
@@ -14,8 +14,8 @@ jobs:
     name: Temp - Fake Publish ${{ matrix.flavor }} ${{ matrix.architecture }}
     strategy:
       matrix:
-        flavor: [upstream]
-        architecture: [arm64]
+        flavor: [upstream, registry1]
+        architecture: [amd64, arm64]
         exclude:
           - flavor: registry1
             architecture: arm64
@@ -27,27 +27,26 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
-
-##### replacing environment setup temporarily to see what i can get working on arm
-      # - name: Environment setup
-      #   uses: defenseunicorns/uds-common/.github/actions/setup@11e591f2ec7d158923d973c85097ce28a5f55db4 # v0.4.5
-      #   with:
-      #     registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
-      #     registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
-      #     ghToken: ${{ secrets.GITHUB_TOKEN }}
+      - name: Environment setup
+        if: ${{ runner.arch != 'ARM64' }}
+        uses: defenseunicorns/uds-common/.github/actions/setup@11e591f2ec7d158923d973c85097ce28a5f55db4 # v0.4.5
+        with:
+          registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
+          registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
+          ghToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install k3d
+        if: ${{ runner.arch == 'ARM64' }}
         shell: bash
         # renovate: datasource=github-tags depName=k3d-io/k3d versioning=semver
         run: curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=v5.6.3 bash
 
       - name: Install UDS CLI
+        if: ${{ runner.arch == 'ARM64' }}
         shell: bash
         # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
         run: curl -o /usr/local/bin/uds -L https://github.com/defenseunicorns/uds-cli/releases/download/v0.11.0/uds-cli_v0.11.0_Linux_arm64 && chmod +x /usr/local/bin/uds
 
-###### end of temporary environment setup stuff
-
       - name: Publish Package
         run: UDS_ARCHITECTURE=${{ matrix.architecture }} uds run -f tasks/fake-publish.yaml package --set FLAVOR=${{ matrix.flavor }}