From 62900c62987f4b2b4088b45815c1aff3e6ed306b Mon Sep 17 00:00:00 2001 From: Luke Cartey Date: Thu, 3 Nov 2022 17:35:00 +0000 Subject: [PATCH 1/2] Use a fixed Ubuntu version Avoid incidental breakages that can occur when using ubuntu-latest and the version is upgraded (for example, clang-format changing). --- .github/workflows/bump-version.yml | 2 +- .github/workflows/code-scanning-pack-gen.yml | 4 ++-- .github/workflows/codeql_unit_tests.yml | 4 ++-- .github/workflows/create-draft-release.yml | 2 +- .github/workflows/generate-html-docs.yml | 2 +- .github/workflows/standard_library_upgrade_tests.yml | 4 ++-- .github/workflows/upgrade_codeql_dependencies.yml | 2 +- .github/workflows/validate-coding-standards.yml | 10 +++++----- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index aa3bb668ca..dad7061670 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -10,7 +10,7 @@ on: jobs: apply-version-bump: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: Apply Version Bump steps: - name: Checkout diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml index 0814e059e8..d277fa45e5 100644 --- a/.github/workflows/code-scanning-pack-gen.yml +++ b/.github/workflows/code-scanning-pack-gen.yml @@ -19,7 +19,7 @@ env: jobs: prepare-code-scanning-pack-matrix: name: Prepare CodeQL Code Scanning pack matrix - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: matrix: ${{ steps.export-code-scanning-pack-matrix.outputs.matrix }} steps: @@ -36,7 +36,7 @@ jobs: create-code-scanning-pack: name: Create Code Scanning pack needs: prepare-code-scanning-pack-matrix - runs-on: ubuntu-20.04-xl + runs-on: ubuntu-22.04-xl strategy: fail-fast: false matrix: ${{ fromJSON(needs.prepare-code-scanning-pack-matrix.outputs.matrix) }} diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml index 1a2374d19d..b23bc0cc19 100644 --- a/.github/workflows/codeql_unit_tests.yml +++ b/.github/workflows/codeql_unit_tests.yml @@ -14,7 +14,7 @@ on: jobs: prepare-unit-test-matrix: name: Prepare CodeQL unit test matrix - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: matrix: ${{ steps.export-unit-test-matrix.outputs.matrix }} steps: @@ -157,7 +157,7 @@ jobs: validate-test-results: name: Validate test results needs: [run-test-suites] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Collect test results uses: actions/download-artifact@v2 diff --git a/.github/workflows/create-draft-release.yml b/.github/workflows/create-draft-release.yml index 43bf8cac06..932c1f2abb 100644 --- a/.github/workflows/create-draft-release.yml +++ b/.github/workflows/create-draft-release.yml @@ -21,7 +21,7 @@ on: jobs: create-draft-release: name: Create draft release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: # AWS CONFIGURATION AWS_EC2_INSTANCE_TYPE: ${{ github.event.inputs.aws_ec2_instance_type }} diff --git a/.github/workflows/generate-html-docs.yml b/.github/workflows/generate-html-docs.yml index 0142c2feed..1093715ad4 100644 --- a/.github/workflows/generate-html-docs.yml +++ b/.github/workflows/generate-html-docs.yml @@ -15,7 +15,7 @@ on: jobs: generate-html-doc: name: Generate HTML documentation - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml index 0a4e58dbd3..a03b43c36f 100644 --- a/.github/workflows/standard_library_upgrade_tests.yml +++ b/.github/workflows/standard_library_upgrade_tests.yml @@ -14,7 +14,7 @@ on: jobs: prepare-unit-test-matrix: name: Prepare CodeQL unit test matrix - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: matrix: ${{ steps.export-unit-test-matrix.outputs.matrix }} steps: @@ -154,7 +154,7 @@ jobs: validate-test-results: name: Validate test results needs: [run-test-suites] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Install Python uses: actions/setup-python@v4 diff --git a/.github/workflows/upgrade_codeql_dependencies.yml b/.github/workflows/upgrade_codeql_dependencies.yml index 01f8bcf339..b06ec6f49c 100644 --- a/.github/workflows/upgrade_codeql_dependencies.yml +++ b/.github/workflows/upgrade_codeql_dependencies.yml @@ -20,7 +20,7 @@ jobs: env: CODEQL_CLI_VERSION: ${{ github.event.inputs.codeql_cli_version }} CODEQL_LIB_COMMIT: ${{ github.event.inputs.codeql_standard_library_commit }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/validate-coding-standards.yml b/.github/workflows/validate-coding-standards.yml index f7fc7563a1..adc2b32908 100644 --- a/.github/workflows/validate-coding-standards.yml +++ b/.github/workflows/validate-coding-standards.yml @@ -18,7 +18,7 @@ env: jobs: validate-package-files: name: Validate Package Files - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -63,7 +63,7 @@ jobs: validate-codeql-format: name: "Validate CodeQL Format" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -94,7 +94,7 @@ jobs: validate-query-help-files: name: Validate Query Help Files - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -129,7 +129,7 @@ jobs: validate-cpp-test-files: name: Validate C++ Test Files - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -152,7 +152,7 @@ jobs: validate-c-test-files: name: Validate C Test Files - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 From 13fe4de715b54ed82bf5b4519357dc8acea1e828 Mon Sep 17 00:00:00 2001 From: Luke Cartey Date: Thu, 3 Nov 2022 22:15:20 +0000 Subject: [PATCH 2/2] Switch back to 20.04-xl runners 22.04-xl doesn't appear to exist. --- .github/workflows/code-scanning-pack-gen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml index d277fa45e5..5a0ef0fb07 100644 --- a/.github/workflows/code-scanning-pack-gen.yml +++ b/.github/workflows/code-scanning-pack-gen.yml @@ -36,7 +36,7 @@ jobs: create-code-scanning-pack: name: Create Code Scanning pack needs: prepare-code-scanning-pack-matrix - runs-on: ubuntu-22.04-xl + runs-on: ubuntu-20.04-xl strategy: fail-fast: false matrix: ${{ fromJSON(needs.prepare-code-scanning-pack-matrix.outputs.matrix) }}