From d77279fe4069ea9df2f32d06b474c81e76b883c8 Mon Sep 17 00:00:00 2001 From: sarthak gupta Date: Mon, 16 Oct 2023 16:14:32 +0530 Subject: [PATCH] ci(workflow): update logic for integration test latest run on macos runner --- .github/workflows/helm-integration-test-backend.yml | 2 +- .github/workflows/helm-integration-test-latest.yml | 2 +- .github/workflows/integration-test-backend.yml | 2 +- .github/workflows/integration-test-latest.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/helm-integration-test-backend.yml b/.github/workflows/helm-integration-test-backend.yml index 984e1d844..15cc6e0b9 100644 --- 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 index e81567d2e..be85883e9 100644 --- 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 index f99eec074..45bf94d22 100644 --- 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 index 9d197df60..2774d0a50 100644 --- 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