fix: issue with power apps and test in ci (#440)

* fix: issue with power apps and test in ci * chore: rename ci job
db-ui · Feb 15, 2023 · 1b2f74a · 1b2f74a
1 parent a791fe6
commit 1b2f74a
Show file tree

Hide file tree

Showing 6 changed files with 438 additions and 25 deletions.
diff --git a/.github/workflows/01-build-power-apps.yml b/.github/workflows/01-build-power-apps.yml
@@ -1,5 +1,5 @@
 ---
-name: Deploy Power Apps
+name: Build Power Apps
 
 on:
   workflow_call:
@@ -9,8 +9,8 @@ on:
         type: string
 
 jobs:
-  build-showcases:
-    name: Deploy Power Apps
+  build-power-apps:
+    name: Build Power Apps
     runs-on: ubuntu-latest
     steps:
       - name: ⬇ Checkout repo
@@ -51,18 +51,6 @@ jobs:
           name: db-ui-powerapps
           path: build-power-apps/DBUI
 
-      - name: ⬆ Upload Release Asset
-        id: upload-release-asset
-        uses: actions/github-script@v6
-        with:
-          result-encoding: json
-          script: |
-            const { default: uploadAsset } = await import('${{ github.workspace }}/.github/scripts/upload-asset.js');
-            const release_id = context.payload.release.id;
-            const assetName = 'DBUI.zip';
-            const assetPath = '${{ github.workspace }}/build-power-apps/DBUI/bin/Release/DBUI.zip';
-            return await uploadAsset({github, context, release_id, assetName, assetPath});
-
       - name: 💀 Killing me softly
         uses: ./.github/actions/cancel-workflow
         if: failure()

diff --git a/.github/workflows/03-publish-packages.yml b/.github/workflows/03-publish-packages.yml
@@ -33,6 +33,12 @@ jobs:
           name: db-ui-outputs
           path: build-outputs
 
+      - name: ⬇ Download Power Apps zip
+        uses: ./.github/actions/download-tar-artifact
+        with:
+          name: db-ui-powerapps
+          path: build-power-apps/DBUI
+
       - name: 📰 Publish to NPM Registries
         run: |
           chmod +rx ./.github/scripts/publish-npm.sh
@@ -44,6 +50,18 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: ⬆ Upload Power Apps Release Asset
+        id: upload-release-asset
+        uses: actions/github-script@v6
+        with:
+          result-encoding: json
+          script: |
+            const { default: uploadAsset } = await import('${{ github.workspace }}/.github/scripts/upload-asset.js');
+            const release_id = context.payload.release.id;
+            const assetName = 'DBUI.zip';
+            const assetPath = '${{ github.workspace }}/build-power-apps/DBUI/bin/Release/DBUI.zip';
+            return await uploadAsset({github, context, release_id, assetName, assetPath});
+
       - name: 💀 Killing me softly
         uses: ./.github/actions/cancel-workflow
         if: failure()

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -35,12 +35,19 @@ jobs:
     uses: ./.github/workflows/01-build-showcases.yml
     needs: [build-packages]
 
+  build-power-apps:
+    uses: ./.github/workflows/01-build-power-apps.yml
+    needs: [build-packages]
+    secrets: inherit
+    with:
+      version: 0.0.0-test
+
   checks-done:
     runs-on: ubuntu-latest
     steps:
       - name: 🎉 Checks done
         run: echo "🎉 All tests were successful."
-    needs: [build-showcases, build-outputs, test-packages]
+    needs: [build-showcases, build-outputs, test-packages, build-power-apps]
 
   deploy:
     uses: ./.github/workflows/03-deploy-gh-pages.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,12 +36,19 @@ jobs:
     uses: ./.github/workflows/02-e2e.yml
     needs: [build-packages]
 
+  build-power-apps:
+    uses: ./.github/workflows/01-build-power-apps.yml
+    needs: [get-publish-version, build-packages]
+    secrets: inherit
+    with:
+      version: ${{ needs.get-publish-version.outputs.version }}
+
   checks-done:
     runs-on: ubuntu-latest
     steps:
       - name: 🎉 Checks done
         run: echo "🎉 All builds were successful."
-    needs: [test-packages, build-outputs, build-showcases]
+    needs: [test-packages, build-outputs, build-showcases, build-power-apps]
 
   deploy:
     uses: ./.github/workflows/03-deploy-gh-pages.yml
@@ -50,13 +57,6 @@ jobs:
       release: ${{ needs.get-publish-version.outputs.release }}
       preRelease: ${{ needs.get-publish-version.outputs.preRelease }}
 
-  build-power-apps:
-    uses: ./.github/workflows/01-build-power-apps.yml
-    needs: [get-publish-version, checks-done, build-packages]
-    secrets: inherit
-    with:
-      version: ${{ needs.get-publish-version.outputs.version }}
-
   publishpackages:
     uses: ./.github/workflows/03-publish-packages.yml
     needs: [get-publish-version, checks-done, build-outputs]