From cff091737a2778bdf2804fd80494ff963d69a212 Mon Sep 17 00:00:00 2001 From: Jacob Ronstadt <147542405+jacob-ronstadt@users.noreply.github.com> Date: Tue, 30 Apr 2024 12:54:42 -0700 Subject: [PATCH 1/4] Update build-codeql.yaml Signed-off-by: Jacob Ronstadt <147542405+jacob-ronstadt@users.noreply.github.com> --- .github/workflows/build-codeql.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-codeql.yaml b/.github/workflows/build-codeql.yaml index 14bd983a..2c359464 100644 --- a/.github/workflows/build-codeql.yaml +++ b/.github/workflows/build-codeql.yaml @@ -106,7 +106,6 @@ jobs: uses: microsoft/setup-msbuild@v2 - name: Run test script shell: pwsh - continue-on-error: true # Allow script to return non-zero exit code env: CONNECTION_STRING: ${{ secrets.CONNECTION_STRING }} ACCOUNT_KEY: ${{ secrets.ACCOUNT_KEY }} @@ -157,7 +156,6 @@ jobs: uses: microsoft/setup-msbuild@v2 - name: Run test script shell: pwsh - continue-on-error: true # Allow script to return non-zero exit code env: CONNECTION_STRING: ${{ secrets.CONNECTION_STRING }} ACCOUNT_KEY: ${{ secrets.ACCOUNT_KEY }} From 0557a1e99d1e5db344392f9151038a3f8043a9b0 Mon Sep 17 00:00:00 2001 From: Jacob Ronstadt <147542405+jacob-ronstadt@users.noreply.github.com> Date: Tue, 30 Apr 2024 13:07:02 -0700 Subject: [PATCH 2/4] Update build-codeql.yaml Signed-off-by: Jacob Ronstadt <147542405+jacob-ronstadt@users.noreply.github.com> --- .github/workflows/build-codeql.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-codeql.yaml b/.github/workflows/build-codeql.yaml index 2c359464..4c384d24 100644 --- a/.github/workflows/build-codeql.yaml +++ b/.github/workflows/build-codeql.yaml @@ -12,9 +12,6 @@ on: # Allow manual scheduling workflow_dispatch: -env: - CODEQL_VERSION: "2.15.4" - CODEQL_LATEST_VERSION: "2.17.1" jobs: build: @@ -36,7 +33,7 @@ jobs: - name: CodeQL Download run: - Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ env.CODEQL_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; + Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ vars.CODEQL_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; Expand-Archive -Path codeql-win64.zip -DestinationPath .\codeql-zip -Force; Move-Item -Path .\codeql-zip\codeql -Destination .\codeql-cli\ @@ -83,7 +80,7 @@ jobs: fetch-depth: 0 - name: CodeQL Download run: - Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ env.CODEQL_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; + Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ vars.CODEQL_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; Expand-Archive -Path codeql-win64.zip -DestinationPath .\codeql-zip -Force; Move-Item -Path .\codeql-zip\codeql -Destination .\codeql-cli\ - name: Install CodeQL pack dependencies @@ -133,7 +130,7 @@ jobs: fetch-depth: 0 - name: CodeQL Download run: - Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ env.CODEQL_LATEST_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; + Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ vars.CODEQL_LATEST_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; Expand-Archive -Path codeql-win64.zip -DestinationPath .\codeql-zip -Force; Move-Item -Path .\codeql-zip\codeql -Destination .\codeql-cli\ - name: Install CodeQL pack dependencies @@ -224,7 +221,7 @@ jobs: - name: CodeQL Download run: - Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ env.CODEQL_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; + Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ vars.CODEQL_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; Expand-Archive -Path codeql-win64.zip -DestinationPath .\codeql-zip -Force; Move-Item -Path .\codeql-zip\codeql -Destination .\codeql-cli\ @@ -259,7 +256,7 @@ jobs: - name: CodeQL Download run: - Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ env.CODEQL_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; + Invoke-WebRequest -Uri "https://github.com/github/codeql-cli-binaries/releases/download/v${{ vars.CODEQL_VERSION }}/codeql-win64.zip" -OutFile codeql-win64.zip; Expand-Archive -Path codeql-win64.zip -DestinationPath .\codeql-zip -Force; Move-Item -Path .\codeql-zip\codeql -Destination .\codeql-cli\ From a8f2cf1f3bfc85b682ec173b9f386dddf2843ff9 Mon Sep 17 00:00:00 2001 From: Jacob Ronstadt <147542405+jacob-ronstadt@users.noreply.github.com> Date: Tue, 30 Apr 2024 13:10:34 -0700 Subject: [PATCH 3/4] Update build-codeql.yaml Signed-off-by: Jacob Ronstadt <147542405+jacob-ronstadt@users.noreply.github.com> --- .github/workflows/build-codeql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-codeql.yaml b/.github/workflows/build-codeql.yaml index 4c384d24..b8feee31 100644 --- a/.github/workflows/build-codeql.yaml +++ b/.github/workflows/build-codeql.yaml @@ -6,7 +6,7 @@ name: Build and Publish Windows CodeQL queries on: # Triggers the workflow on push or pull request events but only for the main and development branches push: - branches: [ main, development, jacob-ronstadt/github_actions_update ] + branches: [ main, development ] pull_request: branches: [ main, development ] From 28cf0cad1e49a58c99a8aaf43d70ed929ede75f5 Mon Sep 17 00:00:00 2001 From: Jacob Ronstadt <147542405+jacob-ronstadt@users.noreply.github.com> Date: Tue, 30 Apr 2024 13:25:08 -0700 Subject: [PATCH 4/4] Update build-codeql.yaml Signed-off-by: Jacob Ronstadt <147542405+jacob-ronstadt@users.noreply.github.com> --- .github/workflows/build-codeql.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-codeql.yaml b/.github/workflows/build-codeql.yaml index b8feee31..4e114de0 100644 --- a/.github/workflows/build-codeql.yaml +++ b/.github/workflows/build-codeql.yaml @@ -114,6 +114,7 @@ jobs: test-codeql-latest-vs-current: # Tests if the latest codeql version produces the same results as the current version. runs-on: windows-latest + continue-on-error: true # Allow script to return non-zero exit code needs: [build,test-query-health] permissions: contents: read