From 81c5b2d993deb47c99c893aeb84765d87a0c4645 Mon Sep 17 00:00:00 2001 From: Angela P Wen Date: Mon, 1 Aug 2022 11:09:29 +0200 Subject: [PATCH] New debug artifacts workflow with separate jobs --- .github/workflows/__debug-artifacts.yml | 96 ------------------ .github/workflows/debug-artifacts.yml | 124 ++++++++++++++++++++++++ pr-checks/checks/debug-artifacts.yml | 36 ------- 3 files changed, 124 insertions(+), 132 deletions(-) delete mode 100644 .github/workflows/__debug-artifacts.yml create mode 100644 .github/workflows/debug-artifacts.yml delete mode 100644 pr-checks/checks/debug-artifacts.yml diff --git a/.github/workflows/__debug-artifacts.yml b/.github/workflows/__debug-artifacts.yml deleted file mode 100644 index e232a7190..000000000 --- a/.github/workflows/__debug-artifacts.yml +++ /dev/null @@ -1,96 +0,0 @@ -# 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 - Debug artifact upload -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: - debug-artifacts: - strategy: - matrix: - include: - - os: ubuntu-latest - version: stable-20210308 - - os: macos-latest - version: stable-20210308 - - os: ubuntu-latest - version: stable-20210319 - - os: macos-latest - version: stable-20210319 - - os: ubuntu-latest - 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 - name: Debug artifact upload - 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: - tools: ${{ steps.prepare-test.outputs.tools-url }} - debug: true - debug-artifact-name: my-debug-artifacts - debug-database-name: my-db - - name: Build code - shell: bash - run: ./build.sh - - uses: ./../action/analyze - id: analysis - - uses: actions/download-artifact@v3 - with: - name: my-debug-artifacts-${{ matrix.os }}-${{ matrix.version }} - - shell: bash - run: | - LANGUAGES="cpp csharp go java javascript python" - for language in $LANGUAGES; do - echo "Checking $language" - if [[ ! -f "$language.sarif" ]] ; then - echo "Missing a SARIF file for $language" - exit 1 - fi - if [[ ! -f "my-db-$language.zip" ]] ; then - echo "Missing a database bundle for $language" - exit 1 - fi - if [[ ! -d "$language/log" ]] ; then - echo "Missing logs for $language" - exit 1 - fi - done - env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml new file mode 100644 index 000000000..28912a98f --- /dev/null +++ b/.github/workflows/debug-artifacts.yml @@ -0,0 +1,124 @@ +# Checks logs, SARIF, and database bundle debug artifacts exist. +name: PR Check - Debug artifact upload +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +on: + push: + branches: + - main + - releases/v1 + - releases/v2 + pull_request: + types: + - opened + - synchronize + - reopened + - ready_for_review + workflow_dispatch: {} +jobs: + upload-artifacts: + strategy: + matrix: + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: ubuntu-latest + 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 + name: Upload debug artifacts + 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: + tools: ${{ steps.prepare-test.outputs.tools-url }} + debug: true + debug-artifact-name: my-debug-artifacts + debug-database-name: my-db + - name: Build code + shell: bash + run: ./build.sh + - uses: ./../action/analyze + id: analysis + download-and-check-artifacts: + strategy: + matrix: + include: + - os: ubuntu-latest + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: ubuntu-latest + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: ubuntu-latest + 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 + name: Download and check debug artifacts + needs: upload-artifacts + timeout-minutes: 45 + runs-on: ${{ matrix.os }} + steps: + - uses: actions/download-artifact@v3 + with: + name: my-debug-artifacts-${{ matrix.os }}-${{ matrix.version }} + - shell: bash + run: | + LANGUAGES="cpp csharp go java javascript python" + for language in $LANGUAGES; do + echo "Checking $language" + if [[ ! -f "$language.sarif" ]] ; then + echo "Missing a SARIF file for $language" + exit 1 + fi + if [[ ! -f "my-db-$language.zip" ]] ; then + echo "Missing a database bundle for $language" + exit 1 + fi + if [[ ! -d "$language/log" ]] ; then + echo "Missing logs for $language" + exit 1 + fi + done + env: + INTERNAL_CODEQL_ACTION_DEBUG_LOC: true \ No newline at end of file diff --git a/pr-checks/checks/debug-artifacts.yml b/pr-checks/checks/debug-artifacts.yml deleted file mode 100644 index 3c42dd47b..000000000 --- a/pr-checks/checks/debug-artifacts.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: "Debug artifact upload" -description: "Checks that debugging artifacts are correctly uploaded" -os: ["ubuntu-latest", "macos-latest"] -steps: - - uses: ./../action/init - with: - tools: ${{ steps.prepare-test.outputs.tools-url }} - debug: true - debug-artifact-name: "my-debug-artifacts" - debug-database-name: "my-db" - - name: Build code - shell: bash - run: ./build.sh - - uses: ./../action/analyze - id: analysis - - uses: actions/download-artifact@v3 - with: - name: my-debug-artifacts-${{ matrix.os }}-${{ matrix.version }} - - shell: bash - run: | - LANGUAGES="cpp csharp go java javascript python" - for language in $LANGUAGES; do - echo "Checking $language" - if [[ ! -f "$language.sarif" ]] ; then - echo "Missing a SARIF file for $language" - exit 1 - fi - if [[ ! -f "my-db-$language.zip" ]] ; then - echo "Missing a database bundle for $language" - exit 1 - fi - if [[ ! -d "$language/log" ]] ; then - echo "Missing logs for $language" - exit 1 - fi - done