Merge pull request #59 from kialj876/18160-pnpm-deployment-fix-2

more pnpm flow fixes
bcgov · Oct 20, 2023 · f6e4cc4 · f6e4cc4
2 parents 5919fe0 + 11a3022
commit f6e4cc4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/.github/actions/firebase/action.yml b/.github/actions/firebase/action.yml
@@ -13,7 +13,13 @@ runs:
   using: "composite"
   steps:
     # Copy files
+    - name: Copy build files to working directory level
+      if: ${{ inputs.package-name != '' }}
+      shell: bash
+      run: |
+        cp -r ${{ inputs.package-name }}/.output .
+
     - name: Copy build/deployment files
       shell: bash
       run: |
-        cp  ${{ github.action_path }}/files/* ${{ inputs.working-directory }}/${{ inputs.package-name }}
+        cp  ${{ github.action_path }}/files/* ${{ inputs.working-directory }}
diff --git a/.github/workflows/ui-cd-pnpm.yaml b/.github/workflows/ui-cd-pnpm.yaml
@@ -108,6 +108,7 @@ jobs:
 
       # Build and push image to Google Container Registry
       - name: Build
+        if: ${{ inputs.package_name != '' }}
         working-directory: ${{ inputs.working_directory }}
         run: |-
           firebase="$(jq '.hosting.site="${{ env.FIREBASE_HOST_NAME }}"' firebase-${{ env.ENVIRONMENT }}.json)"
@@ -116,6 +117,16 @@ jobs:
             --substitutions _DEPLOYMENT_ENVIRONMENT=${{ env.ENVIRONMENT }},_DEPLOYMENT_NODE_VERSION=${{ env.NODE_VERSION }},_DEPLOYMENT_PROJECT=${{ env.GCP_PROJECT }},_DEPLOYMENT_HOST_NAME=${{ env.FIREBASE_HOST_NAME }},_DEPLOYMENT_PCKG_NAME=${{ inputs.package_name }} \
             --config cloudbuild-pnpm-cd.yaml
 
+      - name: Build
+        if: ${{ inputs.package_name == '' }}
+        working-directory: ${{ inputs.working_directory }}
+        run: |-
+          firebase="$(jq '.hosting.site="${{ env.FIREBASE_HOST_NAME }}"' firebase-${{ env.ENVIRONMENT }}.json)"
+          echo -E "${firebase}" > firebase-${{ env.ENVIRONMENT }}.json
+          gcloud builds submit \
+            --substitutions _DEPLOYMENT_ENVIRONMENT=${{ env.ENVIRONMENT }},_DEPLOYMENT_NODE_VERSION=${{ env.NODE_VERSION }},_DEPLOYMENT_PROJECT=${{ env.GCP_PROJECT }},_DEPLOYMENT_HOST_NAME=${{ env.FIREBASE_HOST_NAME }} \
+            --config cloudbuild-pnpm-cd.yaml
+
       # Add git tag
       - name:  Add git tag
         uses: bcgov/bcregistry-sre/.github/actions/add-git-tag@main