Add merge_group to PRs, update workflows to use matrix strategy (#719)

* Add `merge_group` to PRs * Use matrix
Azure-Samples · Apr 22, 2024 · cf56374 · cf56374
1 parent 62ed9b2
commit cf56374
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 49 deletions.
diff --git a/.github/workflows/build-with-push-docker.yml b/.github/workflows/build-with-push-docker.yml
@@ -7,35 +7,22 @@ on:
     branches: [main]
 
 jobs:
-  docker-build-admin:
+  docker-build:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    strategy:
+      matrix:
+        include:
+          - app_name: rag-adminwebapp
+            dockerfile: docker/Admin.Dockerfile
+          - app_name: rag-backend
+            dockerfile: docker/Backend.Dockerfile
+          - app_name: rag-webapp
+            dockerfile: docker/Frontend.Dockerfile
     uses: ./.github/workflows/build-docker.yml
     with:
       registry: fruoccopublic.azurecr.io
       username: fruoccopublic
-      app_name: rag-adminwebapp
-      dockerfile: docker/Admin.Dockerfile
-      push: true
-    secrets: inherit
-
-  docker-build-backend:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      registry: fruoccopublic.azurecr.io
-      username: fruoccopublic
-      app_name: rag-backend
-      dockerfile: docker/Backend.Dockerfile
-      push: true
-    secrets: inherit
-
-  docker-build-frontend:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      registry: fruoccopublic.azurecr.io
-      username: fruoccopublic
-      app_name: rag-webapp
-      dockerfile: docker/Frontend.Dockerfile
+      app_name: ${{ matrix.app_name }}
+      dockerfile: ${{ matrix.dockerfile }}
       push: true
     secrets: inherit
diff --git a/.github/workflows/build-without-push-docker.yml b/.github/workflows/build-without-push-docker.yml
@@ -8,35 +8,24 @@ on:
     - ready_for_review
     - reopened
     - synchronize
-
+  merge_group:
 
 jobs:
-  docker-build-without-push-frontend:
+  docker-build:
+    strategy:
+      matrix:
+        include:
+          - app_name: rag-adminwebapp
+            dockerfile: docker/Admin.Dockerfile
+          - app_name: rag-backend
+            dockerfile: docker/Backend.Dockerfile
+          - app_name: rag-webapp
+            dockerfile: docker/Frontend.Dockerfile
     uses: ./.github/workflows/build-docker.yml
     with:
       registry: fruoccopublic.azurecr.io
       username: fruoccopublic
-      app_name: rag-webapp
-      dockerfile: docker/Frontend.Dockerfile
+      app_name: ${{ matrix.app_name }}
+      dockerfile: ${{ matrix.dockerfile }}
       push: false
     secrets: inherit
-
-  docker-build-without-push-backend:
-    uses: ./.github/workflows/build-docker.yml
-    with:
-        registry: fruoccopublic.azurecr.io
-        username: fruoccopublic
-        app_name: rag-backend
-        dockerfile: docker/Backend.Dockerfile
-        push: false
-    secrets: inherit
-
-  docker-build-without-push-admin:
-    uses: ./.github/workflows/build-docker.yml
-    with:
-        registry: fruoccopublic.azurecr.io
-        username: fruoccopublic
-        app_name: rag-backend
-        dockerfile: docker/Admin.Dockerfile
-        push: false
-    secrets: inherit
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,6 +11,7 @@ on:
       - reopened
       - synchronize
   workflow_call:
+  merge_group:
 
 jobs:
   test_package: