From 35e10d34f324d8f36bd95749639fed4af657deea Mon Sep 17 00:00:00 2001 From: musa-asad Date: Fri, 13 Dec 2024 20:42:20 -0500 Subject: [PATCH] fix conditional --- .github/workflows/build-test-artifacts.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build-test-artifacts.yml b/.github/workflows/build-test-artifacts.yml index 8d08524141..6d53566d16 100644 --- a/.github/workflows/build-test-artifacts.yml +++ b/.github/workflows/build-test-artifacts.yml @@ -93,11 +93,7 @@ jobs: StartIntegrationTests: needs: [ BuildAndUploadPackages, BuildAndUploadITAR, BuildAndUploadCN, BuildDocker ] -<<<<<<< Updated upstream - if: ${{inputs.test-image-before-upload == null || inputs.test-image-before-upload}} -======= if: ${{ (github.event_name != 'workflow_call') || inputs.test-image-before-upload }} ->>>>>>> Stashed changes runs-on: ubuntu-latest steps: - run: gh workflow run integration-test.yml --ref ${{ github.ref_name }} --repo $GITHUB_REPOSITORY -f build_run_id=${{ github.run_id }} -f build_sha=${{ github.sha }} @@ -107,11 +103,7 @@ jobs: StartApplicationSignalsE2ETests: needs: [ BuildAndUploadPackages, BuildAndUploadITAR, BuildAndUploadCN, BuildDocker ] # Workflow only runs against main -<<<<<<< Updated upstream - if: ${{ contains(github.ref_name, 'main') && (inputs.test-image-before-upload == null ||inputs.test-image-before-upload) }} -======= if: ${{ contains(github.ref_name, 'main') && ((github.event_name != 'workflow_call') || inputs.test-image-before-upload) }} ->>>>>>> Stashed changes runs-on: ubuntu-latest steps: - run: gh workflow run application-signals-e2e-test.yml --ref ${{ github.ref_name }} --repo $GITHUB_REPOSITORY -f build_run_id=${{ github.run_id }} -f build_sha=${{ github.sha }}