From 1fd76310fd5c722749b760bcf770821ff4d979ab Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Fri, 11 Nov 2022 18:22:12 +0000 Subject: [PATCH] Update CLI versions in non-generated checks --- ...nt-new-cli.yml => __unset-environment.yml} | 14 ++- .github/workflows/debug-artifacts.yml | 52 +++++------ .../workflows/unset-environment-old-cli.yml | 89 ------------------- pr-checks/checks/unset-environment.yml | 55 ++++++++++++ 4 files changed, 92 insertions(+), 118 deletions(-) rename .github/workflows/{unset-environment-new-cli.yml => __unset-environment.yml} (89%) delete mode 100644 .github/workflows/unset-environment-old-cli.yml create mode 100644 pr-checks/checks/unset-environment.yml diff --git a/.github/workflows/unset-environment-new-cli.yml b/.github/workflows/__unset-environment.yml similarity index 89% rename from .github/workflows/unset-environment-new-cli.yml rename to .github/workflows/__unset-environment.yml index 959a1663af..540cf44070 100644 --- a/.github/workflows/unset-environment-new-cli.yml +++ b/.github/workflows/__unset-environment.yml @@ -1,5 +1,9 @@ -# See `unset-environment-old-cli.yml` for reasoning behind the separate tests. -name: PR Check - Test unsetting environment variables for CLI version >= 2.5.1 +# Warning: This file is generated automatically, and should not be modified. +# Instead, please modify the template in the pr-checks directory and run: +# pip install ruamel.yaml && python3 sync.py +# to regenerate this file. + +name: PR Check - Test unsetting environment variables env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto @@ -22,7 +26,11 @@ jobs: matrix: include: - os: ubuntu-20.04 - version: stable-20210809 + version: stable-20211005 + - os: ubuntu-latest + version: stable-20220120 + - os: ubuntu-latest + version: stable-20220401 - os: ubuntu-latest version: cached - os: ubuntu-latest diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index bef01c453e..50eed8f483 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -20,30 +20,30 @@ jobs: strategy: matrix: include: - - os: ubuntu-20.04 - version: stable-20210308 - - os: macos-latest - version: stable-20210308 - - os: ubuntu-20.04 - version: stable-20210319 - - os: macos-latest - version: stable-20210319 - - os: ubuntu-20.04 - version: stable-20210809 - - os: macos-latest - version: stable-20210809 - - os: ubuntu-latest - version: cached - - os: macos-latest - version: cached - - os: ubuntu-latest - version: latest - - os: macos-latest - version: latest - - os: ubuntu-latest - version: nightly-latest - - os: macos-latest - version: nightly-latest + - os: ubuntu-20.04 + version: stable-20211005 + - os: macos-latest + version: stable-20211005 + - os: ubuntu-latest + version: stable-20220120 + - os: macos-latest + version: stable-20220120 + - os: ubuntu-latest + version: stable-20220401 + - os: macos-latest + version: stable-20220401 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest name: Upload debug artifacts timeout-minutes: 45 runs-on: ${{ matrix.os }} @@ -81,10 +81,10 @@ jobs: - name: Check expected artifacts exist shell: bash run: | - VERSIONS="stable-20210308 stable-20210319 stable-20210809 cached latest nightly-latest" + VERSIONS="stable-20211005 stable-20220120 stable-20220401 cached latest nightly-latest" LANGUAGES="cpp csharp go java javascript python" for version in $VERSIONS; do - if [[ "$version" =~ stable-(20210308|20210319|20210809) ]]; then + if [[ "$version" == stable-20211005 ]]; then # Note the absence of the period in "ubuntu-2004": this is present in the image name # but not the artifact name OPERATING_SYSTEMS="ubuntu-2004 macos-latest" diff --git a/.github/workflows/unset-environment-old-cli.yml b/.github/workflows/unset-environment-old-cli.yml deleted file mode 100644 index 30ec0dd1a8..0000000000 --- a/.github/workflows/unset-environment-old-cli.yml +++ /dev/null @@ -1,89 +0,0 @@ -# There was a bug, fixed in CLI v2.5.1, that didn't propagate environment -# variables that the Java tracer needed. Here we test all languages -# except Java for these CLI versions. In `unset-environment-new-cli.yml` -# we test all languages for recent CLI versions. -name: PR Check - Test unsetting environment variables for CLI version < 2.5.1 -env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GO111MODULE: auto -on: - push: - branches: - - main - - releases/v1 - - releases/v2 - pull_request: - types: - - opened - - synchronize - - reopened - - ready_for_review - workflow_dispatch: {} -jobs: - unset-environment: - strategy: - matrix: - include: - - os: ubuntu-20.04 - version: stable-20210308 - - os: ubuntu-20.04 - version: stable-20210319 - name: Test unsetting environment variables - timeout-minutes: 45 - runs-on: ${{ matrix.os }} - steps: - - name: Check out repository - uses: actions/checkout@v3 - - name: Prepare test - id: prepare-test - uses: ./.github/prepare-test - with: - version: ${{ matrix.version }} - - uses: ./../action/init - with: - languages: csharp,cpp,go,javascript,python - db-location: ${{ runner.temp }}/customDbLocation - tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - - name: Build code - shell: bash - run: env -i PATH="$PATH" HOME="$HOME" ./build.sh - - uses: ./../action/analyze - id: analysis - env: - TEST_MODE: true - - shell: bash - run: | - CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}" - if [[ ! -d "$CPP_DB" ]] || [[ ! "$CPP_DB" == "${RUNNER_TEMP}/customDbLocation/cpp" ]]; then - echo "::error::Did not create a database for CPP, or created it in the wrong location." \ - "Expected location was '${RUNNER_TEMP}/customDbLocation/cpp' but actual was '${CPP_DB}'" - exit 1 - fi - CSHARP_DB="${{ fromJson(steps.analysis.outputs.db-locations).csharp }}" - if [[ ! -d "$CSHARP_DB" ]] || [[ ! "$CSHARP_DB" == "${RUNNER_TEMP}/customDbLocation/csharp" ]]; then - echo "::error::Did not create a database for C Sharp, or created it in the wrong location." \ - "Expected location was '${RUNNER_TEMP}/customDbLocation/csharp' but actual was '${CSHARP_DB}'" - exit 1 - fi - GO_DB="${{ fromJson(steps.analysis.outputs.db-locations).go }}" - if [[ ! -d "$GO_DB" ]] || [[ ! "$GO_DB" == "${RUNNER_TEMP}/customDbLocation/go" ]]; then - echo "::error::Did not create a database for Go, or created it in the wrong location." \ - "Expected location was '${RUNNER_TEMP}/customDbLocation/go' but actual was '${GO_DB}'" - exit 1 - fi - JAVASCRIPT_DB="${{ fromJson(steps.analysis.outputs.db-locations).javascript }}" - if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ ! "$JAVASCRIPT_DB" == "${RUNNER_TEMP}/customDbLocation/javascript" ]]; then - echo "::error::Did not create a database for Javascript, or created it in the wrong location." \ - "Expected location was '${RUNNER_TEMP}/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'" - exit 1 - fi - PYTHON_DB="${{ fromJson(steps.analysis.outputs.db-locations).python }}" - if [[ ! -d "$PYTHON_DB" ]] || [[ ! "$PYTHON_DB" == "${RUNNER_TEMP}/customDbLocation/python" ]]; then - echo "::error::Did not create a database for Python, or created it in the wrong location." \ - "Expected location was '${RUNNER_TEMP}/customDbLocation/python' but actual was '${PYTHON_DB}'" - exit 1 - fi - env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true diff --git a/pr-checks/checks/unset-environment.yml b/pr-checks/checks/unset-environment.yml new file mode 100644 index 0000000000..14174c40c1 --- /dev/null +++ b/pr-checks/checks/unset-environment.yml @@ -0,0 +1,55 @@ +name: "Test unsetting environment variables" +description: "An end-to-end integration test that unsets some environment variables" +operatingSystems: ["ubuntu"] +steps: + - uses: ./../action/init + with: + db-location: ${{ runner.temp }}/customDbLocation + tools: ${{ steps.prepare-test.outputs.tools-url }} + env: + TEST_MODE: true + - name: Build code + shell: bash + run: env -i PATH="$PATH" HOME="$HOME" ./build.sh + - uses: ./../action/analyze + id: analysis + env: + TEST_MODE: true + - shell: bash + run: | + CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}" + if [[ ! -d "$CPP_DB" ]] || [[ ! "$CPP_DB" == "${RUNNER_TEMP}/customDbLocation/cpp" ]]; then + echo "::error::Did not create a database for CPP, or created it in the wrong location." \ + "Expected location was '${RUNNER_TEMP}/customDbLocation/cpp' but actual was '${CPP_DB}'" + exit 1 + fi + CSHARP_DB="${{ fromJson(steps.analysis.outputs.db-locations).csharp }}" + if [[ ! -d "$CSHARP_DB" ]] || [[ ! "$CSHARP_DB" == "${RUNNER_TEMP}/customDbLocation/csharp" ]]; then + echo "::error::Did not create a database for C Sharp, or created it in the wrong location." \ + "Expected location was '${RUNNER_TEMP}/customDbLocation/csharp' but actual was '${CSHARP_DB}'" + exit 1 + fi + GO_DB="${{ fromJson(steps.analysis.outputs.db-locations).go }}" + if [[ ! -d "$GO_DB" ]] || [[ ! "$GO_DB" == "${RUNNER_TEMP}/customDbLocation/go" ]]; then + echo "::error::Did not create a database for Go, or created it in the wrong location." \ + "Expected location was '${RUNNER_TEMP}/customDbLocation/go' but actual was '${GO_DB}'" + exit 1 + fi + JAVA_DB="${{ fromJson(steps.analysis.outputs.db-locations).java }}" + if [[ ! -d "$JAVA_DB" ]] || [[ ! "$JAVA_DB" == "${RUNNER_TEMP}/customDbLocation/java" ]]; then + echo "::error::Did not create a database for Java, or created it in the wrong location." \ + "Expected location was '${RUNNER_TEMP}/customDbLocation/java' but actual was '${JAVA_DB}'" + exit 1 + fi + JAVASCRIPT_DB="${{ fromJson(steps.analysis.outputs.db-locations).javascript }}" + if [[ ! -d "$JAVASCRIPT_DB" ]] || [[ ! "$JAVASCRIPT_DB" == "${RUNNER_TEMP}/customDbLocation/javascript" ]]; then + echo "::error::Did not create a database for Javascript, or created it in the wrong location." \ + "Expected location was '${RUNNER_TEMP}/customDbLocation/javascript' but actual was '${JAVASCRIPT_DB}'" + exit 1 + fi + PYTHON_DB="${{ fromJson(steps.analysis.outputs.db-locations).python }}" + if [[ ! -d "$PYTHON_DB" ]] || [[ ! "$PYTHON_DB" == "${RUNNER_TEMP}/customDbLocation/python" ]]; then + echo "::error::Did not create a database for Python, or created it in the wrong location." \ + "Expected location was '${RUNNER_TEMP}/customDbLocation/python' but actual was '${PYTHON_DB}'" + exit 1 + fi