fix conditional

aws · Dec 14, 2024 · 35e10d3 · 35e10d3
1 parent 8b2d1f3
commit 35e10d3
Showing 1 changed file with 0 additions and 8 deletions.
diff --git 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 }}