diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 0fc55f2970..357fda7d0a 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index eeed7f3dca..5e3a1a8625 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 01b0c3e224..e3bde8456e 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index 2fa4dd308d..b700b7644c 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index d785779eb0..a3f7209211 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index b85cd6fadd..6ddb46b90a 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index f89d77ca75..8f416388c7 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index 2cc72c05ba..21ba978309 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index cd0a1da52f..118440242c 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 9b54794c3b..369de3aa1c 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__ml-powered-queries.yml b/.github/workflows/__ml-powered-queries.yml index 848de5f94a..71335d7284 100644 --- a/.github/workflows/__ml-powered-queries.yml +++ b/.github/workflows/__ml-powered-queries.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 9b3cff5d50..44552b1c25 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 744ced18c3..aab56afa65 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index dc4221656a..0963924765 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 47b1ecc738..ebb0b0f1eb 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index a9bbac0759..13887ba5d7 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index a6c5a4ec51..a9ed0eb2dd 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index b06628b49d..a706b73751 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index b74e93ff44..2df8f1f456 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index 01e2a98381..036c912914 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 67d79c5c95..3d16460aa0 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml index 63c19736ad..f47aae05b6 100644 --- a/.github/workflows/__swift-autobuild.yml +++ b/.github/workflows/__swift-autobuild.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index df78cd86be..dbade7b300 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index a3721e6132..c6d13ab7b4 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index fe83965094..6d9312ee2c 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 95327eddf7..82fcf7460c 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index a499842291..dcba338e44 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 47a1865f8f..7c7a24f240 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 4ea0a1bdbc..84c822374f 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a9c45b5445..ee7f36528c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,9 +2,9 @@ name: "CodeQL action" on: push: - branches: [main, releases/v1, releases/v2] + branches: [main, releases/v2] pull_request: - branches: [main, releases/v1, releases/v2] + branches: [main, releases/v2] # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened # by other workflows. types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/codescanning-config-cli.yml b/.github/workflows/codescanning-config-cli.yml index 4cf405f022..272dc3a672 100644 --- a/.github/workflows/codescanning-config-cli.yml +++ b/.github/workflows/codescanning-config-cli.yml @@ -9,7 +9,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/debug-artifacts-failure.yml b/.github/workflows/debug-artifacts-failure.yml index 8fc0102e61..0d60ca76ce 100644 --- a/.github/workflows/debug-artifacts-failure.yml +++ b/.github/workflows/debug-artifacts-failure.yml @@ -10,7 +10,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 836d7cad44..dd2aa90ff9 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -9,7 +9,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/expected-queries-runs.yml b/.github/workflows/expected-queries-runs.yml index d74e90acbf..7b4b88fe83 100644 --- a/.github/workflows/expected-queries-runs.yml +++ b/.github/workflows/expected-queries-runs.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 8b36f4ed52..d59939c9bf 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -2,7 +2,7 @@ name: PR Checks on: push: - branches: [main, releases/v1, releases/v2] + branches: [main, releases/v2] pull_request: # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened # by other workflows. @@ -70,23 +70,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - # Checks for any conflict markers created by git. This check is primarily intended to validate that - # any merge conflicts in the v2 -> v1 backport PR are fixed before the PR is merged. - - name: Check for merge conflicts - run: | - # Use `|| true` since grep returns exit code 1 if there are no matches, and we don't want - # this to fail the workflow. - FILES_WITH_CONFLICTS=$(grep --extended-regexp --ignore-case --line-number --recursive \ - '^(<<<<<<<|>>>>>>>)' . || true) - if [[ "${FILES_WITH_CONFLICTS}" ]]; then - echo "Fail: Found merge conflict markers in the following files:" - echo "" - echo "${FILES_WITH_CONFLICTS}" - exit 1 - else - echo "Success: Found no merge conflict markers." - fi - - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index e8e0a8d317..a941fa8310 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, releases/v1, releases/v2] + branches: [main, releases/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/query-filters.yml b/.github/workflows/query-filters.yml index 864a4fdbeb..c384a231dd 100644 --- a/.github/workflows/query-filters.yml +++ b/.github/workflows/query-filters.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - releases/v1 - releases/v2 pull_request: types: diff --git a/.github/workflows/script/update-required-checks.sh b/.github/workflows/script/update-required-checks.sh index dfb1fc0f5a..f9f6a1195d 100755 --- a/.github/workflows/script/update-required-checks.sh +++ b/.github/workflows/script/update-required-checks.sh @@ -29,7 +29,7 @@ echo "$CHECKS" | jq echo "{\"contexts\": ${CHECKS}}" > checks.json -for BRANCH in main releases/v2 releases/v1; do +for BRANCH in main releases/v2; do echo "Updating $BRANCH" gh api --silent -X "PATCH" "repos/github/codeql-action/branches/$BRANCH/protection/required_status_checks" --input checks.json done diff --git a/pr-checks/sync.py b/pr-checks/sync.py index 74dd8c854c..219e7335cb 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -132,7 +132,7 @@ def writeHeader(checkStream): }, 'on': { 'push': { - 'branches': ['main', 'releases/v1', 'releases/v2'] + 'branches': ['main', 'releases/v2'] }, 'pull_request': { 'types': ["opened", "synchronize", "reopened", "ready_for_review"]