diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index a9eb88c209..0858a82a6e 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__debug-artifacts.yml b/.github/workflows/__debug-artifacts.yml index 01ca00e8c2..783375f9d6 100644 --- a/.github/workflows/__debug-artifacts.yml +++ b/.github/workflows/__debug-artifacts.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index 419df5ca02..27f7458cb2 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 7c7bc166f4..6b7ab228b0 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__go-custom-tracing-autobuild.yml b/.github/workflows/__go-custom-tracing-autobuild.yml index 476e77e986..ba31a9057a 100644 --- a/.github/workflows/__go-custom-tracing-autobuild.yml +++ b/.github/workflows/__go-custom-tracing-autobuild.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__go-custom-tracing.yml b/.github/workflows/__go-custom-tracing.yml index 79027d0171..02052139f4 100644 --- a/.github/workflows/__go-custom-tracing.yml +++ b/.github/workflows/__go-custom-tracing.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 23fea03a3e..3dcfa39fd5 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 7cf4ee30b6..b997bcd50e 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 49e45dc7c5..0873bee299 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 3cec3d0d19..801a1d9100 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index cfb4b57c46..ca9be2298c 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index bd36d3f737..43c391dcdb 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 39c29be32b..d7d911f3d8 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index c2d4b20c03..673888ead4 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index e812114a4e..08264bdc3e 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 57aeb4c697..118934421f 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__test-ruby.yml b/.github/workflows/__test-ruby.yml index 2b9aed876a..482c123572 100644 --- a/.github/workflows/__test-ruby.yml +++ b/.github/workflows/__test-ruby.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index cd3b173201..314ebf1700 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 327d59dd8c..88caf594a3 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index fc26db09b3..955cdc9625 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -12,6 +12,7 @@ on: branches: - main - v1 + - v2 pull_request: types: - opened diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index e0f56a9eb1..6565ea2e94 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -2,7 +2,7 @@ name: PR Checks (Basic Checks and Runner) on: push: - branches: [main, v1] + branches: [main, v1, v2] pull_request: # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened # by other workflows. diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 220cebb202..e6ae40c35f 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -2,7 +2,7 @@ name: Test Python Package Installation on Linux and Mac on: push: - branches: [main, v1] + branches: [main, v1, v2] pull_request: # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened # by other workflows. diff --git a/.github/workflows/release-runner.yml b/.github/workflows/release-runner.yml deleted file mode 100644 index 978fb05605..0000000000 --- a/.github/workflows/release-runner.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Release runner - -on: - workflow_dispatch: - inputs: - bundle-tag: - description: 'Tag of the bundle release (e.g., "codeql-bundle-20200826")' - required: false - -jobs: - release-runner: - timeout-minutes: 45 - runs-on: ubuntu-latest - env: - RELEASE_TAG: "${{ github.event.inputs.bundle-tag }}" - - strategy: - matrix: - extension: ["linux", "macos", "win.exe"] - - steps: - - uses: actions/checkout@v2 - - - name: Build runner - run: | - cd runner - npm install - npm run build-runner - - - uses: actions/upload-artifact@v2 - with: - name: codeql-runner-${{matrix.extension}} - path: runner/dist/codeql-runner-${{matrix.extension}} - - - name: Resolve Upload URL for the release - if: ${{ github.event.inputs.bundle-tag != null }} - id: save_url - run: | - UPLOAD_URL=$(curl -sS \ - "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}" \ - -H "Accept: application/json" \ - -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" | jq .upload_url | sed s/\"//g) - echo ${UPLOAD_URL} - echo "::set-output name=upload_url::${UPLOAD_URL}" - - - name: Upload Platform Package - if: ${{ github.event.inputs.bundle-tag != null }} - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.save_url.outputs.upload_url }} - asset_path: runner/dist/codeql-runner-${{matrix.extension}} - asset_name: codeql-runner-${{matrix.extension}} - asset_content_type: application/octet-stream diff --git a/.github/workflows/split.yml b/.github/workflows/split.yml deleted file mode 100644 index 261fb81d22..0000000000 --- a/.github/workflows/split.yml +++ /dev/null @@ -1,74 +0,0 @@ -# -# Split the CodeQL Bundle into platform bundles -# -# Instructions: -# 1. Upload the new codeql-bundle (codeql-bundle.tar.gz) as an asset of the -# release (codeql-bundle-20200826) -# 2. Take note of the CLI Release used by the bundle (e.g., v2.2.5) -# 3. Manually launch this workflow file (via the Actions UI) specifying -# - The CLI Release (e.g., v2.2.5) -# - The release tag (e.g., codeql-bundle-20200826) -# 4. If everything succeeds you should see 3 new assets. -# - -name: Split Bundle - -on: - workflow_dispatch: - inputs: - cli-release: - description: 'CodeQL CLI Release (e.g., "v2.2.5")' - required: true - bundle-tag: - description: 'Tag of the bundle release (e.g., "codeql-bundle-20200826")' - required: true - -jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 45 - env: - CLI_RELEASE: "${{ github.event.inputs.cli-release }}" - RELEASE_TAG: "${{ github.event.inputs.bundle-tag }}" - - strategy: - fail-fast: false - matrix: - platform: ["linux64", "osx64", "win64"] - - steps: - - name: Resolve Upload URL for the release - id: save_url - run: | - UPLOAD_URL=$(curl -sS \ - "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}" \ - -H "Accept: application/json" \ - -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" | jq .upload_url | sed s/\"//g) - echo ${UPLOAD_URL} - echo "::set-output name=upload_url::${UPLOAD_URL}" - - - name: Download CodeQL CLI and Bundle - run: | - wget --no-verbose "https://github.com/${GITHUB_REPOSITORY}/releases/download/${RELEASE_TAG}/codeql-bundle.tar.gz" - wget --no-verbose "https://github.com/github/codeql-cli-binaries/releases/download/${CLI_RELEASE}/codeql-${{matrix.platform}}.zip" - - - name: Create Platform Package - # Replace the codeql-binaries with the platform specific ones - run: | - gunzip codeql-bundle.tar.gz - tar -f codeql-bundle.tar --delete codeql - unzip -q codeql-${{matrix.platform}}.zip - tar -f codeql-bundle.tar --append codeql - gzip codeql-bundle.tar - mv codeql-bundle.tar.gz codeql-bundle-${{matrix.platform}}.tar.gz - du -sh codeql-bundle-${{matrix.platform}}.tar.gz - - - name: Upload Platform Package - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.save_url.outputs.upload_url }} - asset_path: ./codeql-bundle-${{matrix.platform}}.tar.gz - asset_name: codeql-bundle-${{matrix.platform}}.tar.gz - asset_content_type: application/tar+gzip diff --git a/pr-checks/sync.py b/pr-checks/sync.py index 4d1a6aca71..7d5de702d8 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -108,7 +108,7 @@ def writeHeader(checkStream): }, 'on': { 'push': { - 'branches': ['main', 'v1'] + 'branches': ['main', 'v1', 'v2'] }, 'pull_request': { 'types': ["opened", "synchronize", "reopened", "ready_for_review"]