.github/workflows/changes.yaml

@@ -4,8 +4,8 @@ on:
     outputs:
       api:
         value: ${{ jobs.changes.outputs.api }}
-      app:
-        value: ${{ jobs.changes.outputs.app }}
+      client:
+        value: ${{ jobs.changes.outputs.client }}
 
 jobs:
   changes:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       api: ${{ steps.filter.outputs.api }}
-      app: ${{ steps.filter.outputs.app }}
+      client: ${{ steps.filter.outputs.client }}
     steps:
       - uses: actions/checkout@v3
       
@@ -24,5 +24,5 @@ jobs:
           filters: |
             api:
               - 'api/**'
-            app:
-              - 'app/**'
+            client:
+              - 'client/**'

.github/workflows/main.yaml

@@ -9,7 +9,7 @@ jobs:
     uses: ./.github/workflows/changes.yaml
 
   build:
-    if: ${{ needs.changes.outputs.app == 'true' }}
+    if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true' }}
     name: build
     needs:
       - changes

.github/workflows/pull_request.yaml

@@ -7,23 +7,12 @@ jobs:
   changes:
     uses: ./.github/workflows/changes.yaml
 
-  build-api:
-    if: ${{ needs.changes.outputs.api == 'true' }}
-    name: build-api
+  build:
+    if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true'}}
+    name: build
     needs:
       - changes
-    uses: ./.github/workflows/api_build.yaml
-    with:
-      environment_name: pull_request
-      version_number: ${{ github.run_id }}
-    secrets: inherit
-
-  build-app:
-    if: ${{ needs.changes.outputs.app == 'true' }}
-    name: build-app
-    needs:
-      - changes
-    uses: ./.github/workflows/app_build.yaml
+    uses: ./.github/workflows/build.yaml
     with:
       environment_name: pull_request
       version_number: ${{ github.run_id }}