Update build-codeql.yaml test env

Signed-off-by: Jacob Ronstadt <[email protected]>
microsoft · Jun 27, 2024 · 45f39b2 · 45f39b2
1 parent c1a3588
commit 45f39b2
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/.github/workflows/build-codeql.yaml b/.github/workflows/build-codeql.yaml
@@ -68,18 +68,22 @@ jobs:
       run: .\codeql-cli\codeql.cmd query compile --check-only .\src
 
   test-query-health:
-    env:
-      CONNECTION_STRING: ${{ secrets.CONNECTION_STRING }}
-      SHARE_NAME: ${{ secrets.SHARE_NAME }}
-      CONTAINER_NAME: ${{ secrets.CONTAINER_NAME }}
-    if: ${{ env.testCONNECTION_STRING != '' }}
     runs-on: windows-latest
     continue-on-error: true # Allow script to return non-zero exit code
     needs: build
     permissions:
       contents: read
       packages: write
+    env:
+      CONNECTION_STRING: ${{ secrets.CONNECTION_STRING }}
+      SHARE_NAME: ${{ secrets.SHARE_NAME }}
+      CONTAINER_NAME: ${{ secrets.CONTAINER_NAME }}
     steps:
+    - name: Check Env
+      shell: pwsh
+      if: ${{ env.testCONNECTION_STRING == '' }}
+      run: exit 1
+
     - name: Enable long git paths
       shell: cmd
       run: git config --global core.longpaths true
@@ -113,20 +117,27 @@ jobs:
       uses: microsoft/setup-msbuild@v2
     - name: Run test script
       shell: pwsh
-
       run: python src\drivers\test\build_create_analyze_test.py --codeql_path .\codeql-cli\codeql.exe --no_build --compare_results --connection_string "$env:CONNECTION_STRING" --share_name "$env:SHARE_NAME" --container_name "$env:CONTAINER_NAME"
 
 
   test-codeql-latest-vs-current:
   # Tests if the latest codeql version produces the same results as the current version. 
-    if: ${{ env.CONNECTION_STRING != '' }}
     runs-on: windows-latest
     continue-on-error: true # Allow script to return non-zero exit code
     needs: [build,test-query-health]
     permissions:
       contents: read
       packages: write
+    env:
+      CONNECTION_STRING: ${{ secrets.CONNECTION_STRING }}
+      SHARE_NAME: ${{ secrets.SHARE_NAME }}
+      CONTAINER_NAME: ${{ secrets.CONTAINER_NAME }}
     steps:
+    - name: Check Env
+      shell: pwsh
+      if: ${{ env.CONNECTION_STRING == '' }}
+      run: exit 1
+
     - name: Enable long git paths
       shell: cmd
       run: git config --global core.longpaths true
@@ -161,9 +172,6 @@ jobs:
       uses: microsoft/setup-msbuild@v2
     - name: Run test script
       shell: pwsh
-      env:
-        CONNECTION_STRING: ${{ secrets.CONNECTION_STRING }}
-        SHARE_NAME: ${{ secrets.SHARE_NAME }}
       run: python src\drivers\test\build_create_analyze_test.py --codeql_path .\codeql-cli\codeql.exe --no_build --compare_results --connection_string "$env:CONNECTION_STRING" --share_name "$env:SHARE_NAME" 
 
   test-pack-version-update: