Merge branch 'drupal10' of https://github.com/NRCan/nrwxt into drupal10

NRCan · Mar 6, 2024 · e32b76f · e32b76f
2 parents e8a1c70 + e630f56
commit e32b76f
Showing 1 changed file with 14 additions and 36 deletions.
diff --git a/.github/workflows/drupal10_ces-drupal.yml b/.github/workflows/drupal10_ces-drupal.yml
@@ -10,9 +10,14 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  deploy:
     runs-on: ubuntu-latest
-
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+
     steps:
       - uses: actions/checkout@v4
 
@@ -30,40 +35,13 @@ jobs:
       - name: Run composer install if composer.json exists
         if: steps.check_files.outputs.files_exists == 'true'
         run: composer validate --no-check-publish && composer install --prefer-dist --no-progress
-
-      - name: Zip artifact for deployment
-        run: zip release.zip ./* -r
-
-      - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v3
+
+      - name: Login to Azure
+        uses: azure/login@v1
         with:
-          name: php-app
-          path: release.zip
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: 'Production'
-      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-    permissions:
-      id-token: write #This is required for requesting the JWT
-
-    steps:
-      - name: Download artifact from build job
-        uses: actions/download-artifact@v3
-        with:
-          name: php-app
-
-      - name: Unzip artifact for deployment
-        run: unzip release.zip
-
-      - name: Login to Azure
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_E9877C94768C47CCB742173B1104ABD1 }}
-          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_1E5FB74BCF914AADABEBD97712D3ABD6 }}
-          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_8DFEB8FE1BA9418CAAEBD4AB75F02A6F }}
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_E9877C94768C47CCB742173B1104ABD1 }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_1E5FB74BCF914AADABEBD97712D3ABD6 }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_8DFEB8FE1BA9418CAAEBD4AB75F02A6F }}
 
       - name: 'Deploy to Azure Web App'
         uses: azure/webapps-deploy@v2
@@ -72,4 +50,4 @@ jobs:
           app-name: 'ces-drupal'
           slot-name: 'Production'
           package: .
-
+