From 105549611b7e2640d0fa90819089a251c74d1610 Mon Sep 17 00:00:00 2001
From: Jason Heath <jason.heath@progress.com>
Date: Mon, 1 Jul 2024 20:19:27 -0400
Subject: [PATCH] wip 1719879567

Signed-off-by: Jason Heath <jason.heath@progress.com>
---
 .github/workflows/hab-pkg-build-upload.yaml | 28 ++++++++-------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/hab-pkg-build-upload.yaml b/.github/workflows/hab-pkg-build-upload.yaml
index 11851d3c7..db740dab5 100644
--- a/.github/workflows/hab-pkg-build-upload.yaml
+++ b/.github/workflows/hab-pkg-build-upload.yaml
@@ -110,50 +110,42 @@ jobs:
   # - don't have a habitat-dev plan directory
   # - have architecture specific plan directories
   arch-target-packages:
+    name: ${{matrix.components}} ${{matrix.arches}} hab pkg (plan file)
     needs: windows-pre-build
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        #os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest]
         channel: [unstable]
         components: [builder-worker]
-        # subdir: [x86_64-linux, x86_64-windows]
-        subdir: [x86_64-linux, x86_64-linux-kernel2, x86_64-windows]
-        # exclude:
-        #   - os: ubuntu-latest
-        #     subdir: x86_64-windows
-        #   - os: windows-latest
-        #     subdir: x86_64-linux
-        #   - os: windows-latest
-        #     subdir: x86_64-linux-kernel2
+        arches: [x86_64-linux, x86_64-linux-kernel2, x86_64-windows]
     runs-on: ${{matrix.os}}
     steps:
 
       - name: Checkout
         uses: actions/checkout@v4
 
-      - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.subdir != 'x86_64-windows' }}
+      - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.arches != 'x86_64-windows' }}
         name: Install Habitat
         uses: ./.github/actions/hab-install-linux
-      - if: ${{ matrix.os == 'windows-latest' && matrix.subdir == 'x86_64-windows' }}
+      - if: ${{ matrix.os == 'windows-latest' && matrix.arches == 'x86_64-windows' }}
         name: Install Habitat
         uses: ./.github/actions/hab-install-windows
 
-      - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.subdir != 'x86_64-windows' }}
+      - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.arches != 'x86_64-windows' }}
         name: Build and Upload Habitat Package
         uses: ./.github/actions/hab-pkg-build-and-upload-linux
         with:
           hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
           hab-origin: ${{ env.HAB_ORIGIN }}
-          bldr-component: components/${{matrix.components}}/habitat/${{matrix.subdir}}
-      - if: ${{ matrix.os == 'windows-latest' && matrix.subdir == 'x86_64-windows' }}
+          bldr-component: components/${{matrix.components}}/habitat/${{matrix.arches}}
+      - if: ${{ matrix.os == 'windows-latest' && matrix.arches == 'x86_64-windows' }}
         name: Build and Upload Habitat Package
         uses: ./.github/actions/hab-pkg-build-and-upload-windows
         with:
           hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
           hab-origin: ${{ env.HAB_ORIGIN }}
-          bldr-component: components/${{matrix.components}}/habitat/${{matrix.subdir}}
+          bldr-component: components/${{matrix.components}}/habitat/${{matrix.arches}}
           app-version: ${{ needs.pre-build.outputs.app_version }}
           build-date-time: ${{ needs.pre-build.outputs.date }}
 
@@ -194,7 +186,7 @@ jobs:
   #         bldr-component: components/${{matrix.components}}/habitat-dev
 
 
-# JAH: rename subdir
+# JAH: rename arches
 # JAH: trigger appropriately
 # JAH: Set the hab_auth_token more appropriately
 # JAH: stop using jasonheath origin