From 3dc1c03e9671663cb3f53a75950784f1c4869f5c Mon Sep 17 00:00:00 2001
From: Jason Naylor <jason_naylor@sil.org>
Date: Wed, 5 Jun 2024 14:31:18 -0700
Subject: [PATCH] Download the signed msi artifact and unzip it before Bundling

---
 .github/workflows/ci-cd.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 7ca26de4..fdc91620 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -133,7 +133,7 @@ jobs:
 
   build-offline-bundle:
     name: Build offline bundle
-#    needs: sign-msi
+    needs: sign-msi
     if: github.event_name != 'pull_request'
     runs-on: windows-latest
     steps:
@@ -152,10 +152,21 @@ jobs:
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2
+        
+      - name: Download FlexBridge artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: FlexBridge.msi
+          path: src/WiXInstaller/BaseInstallerBuild  # Target directory for the downloaded artifact
+          run: ls -R src/WiXInstaller/BaseInstallerBuild
 
+#      - name: Unzip FlexBridge artifact
+#        run: unzip src/WiXInstaller/BaseInstallerBuild/FlexBridge.msi.zip -d src/WiXInstaller/BaseInstallerBuild
+        
       # All the following are used only when building an installer after a merge
       - name: Build Bundles
         id: build_bundles
         shell: cmd
         run: |
+          msbuild build/FLExBridge.proj /t:RestoreBuildTasks;RestorePackages
           msbuild build/FLExBridge.proj /t:BuildProductBaseBundles
\ No newline at end of file