ci(workflow): update logic for integration test latest run on macos r…

…unner
instill-ai · Oct 16, 2023 · d77279f · d77279f
1 parent c4175a2
commit d77279f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/helm-integration-test-backend.yml b/.github/workflows/helm-integration-test-backend.yml
@@ -109,7 +109,7 @@ jobs:
           make integration-test API_GATEWAY_URL=localhost:${API_GATEWAY_PORT}
 
   helm-integration-test-latest-mac:
-    if: inputs.target == 'latest' && github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.merged == true 
+    if: inputs.target == 'latest' && github.ref == 'refs/heads/main'
     runs-on: [self-hosted,macOS,vdp]
     steps:
       - name: Set up environment

diff --git a/.github/workflows/helm-integration-test-latest.yml b/.github/workflows/helm-integration-test-latest.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         component: [pipeline-backend, connector-backend, controller-vdp]
-    uses: instill-ai/vdp/.github/workflows/helm-integration-test-backend.yml@main
+    uses: instill-ai/vdp/.github/workflows/helm-integration-test-backend.yml@sarthakgupta/ins-2157-need-to-add-a-logic-to-trigger-that-job-only-when-its-a-push
     with:
       component: ${{ matrix.component }}
       target: latest
diff --git a/.github/workflows/integration-test-backend.yml b/.github/workflows/integration-test-backend.yml
@@ -89,7 +89,7 @@ jobs:
           make integration-test API_GATEWAY_URL=localhost:${API_GATEWAY_PORT}
 
   integration-test-latest-mac:
-    if: inputs.target == 'latest' && github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.merged == true 
+    if: inputs.target == 'latest' && github.ref == 'refs/heads/main'
     runs-on: [self-hosted,macOS,vdp]
     steps:
       - name: Set up environment

diff --git a/.github/workflows/integration-test-latest.yml b/.github/workflows/integration-test-latest.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         component: [pipeline-backend, connector-backend, controller-vdp]
-    uses: instill-ai/vdp/.github/workflows/integration-test-backend.yml@main
+    uses: instill-ai/vdp/.github/workflows/integration-test-backend.yml@sarthakgupta/ins-2157-need-to-add-a-logic-to-trigger-that-job-only-when-its-a-push
     with:
       component: ${{ matrix.component }}
       target: latest