From c90bb9fc9a11184763ed37e550da4eb55d5659d4 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Tue, 18 Mar 2025 08:48:37 +0000 Subject: [PATCH 1/2] [Github] Bump most actions to ubuntu 24.04 This patch bumps most of the workflows to ubuntu 24.04, with the exception of worklfows that depend on the CI container, which will need to be updated separately before we are then able to use it for the other workflows. --- .github/workflows/build-ci-container.yml | 4 ++-- .github/workflows/commit-access-greeter.yml | 2 +- .github/workflows/commit-access-review.yml | 2 +- .github/workflows/release-asset-audit.yml | 2 +- .github/workflows/release-binaries-all.yml | 6 +++--- .github/workflows/release-binaries.yml | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-ci-container.yml b/.github/workflows/build-ci-container.yml index 1921a3675166d..994435a8973b6 100644 --- a/.github/workflows/build-ci-container.yml +++ b/.github/workflows/build-ci-container.yml @@ -27,9 +27,9 @@ jobs: # The arch names should match the names used on dockerhub. # See https://github.com/docker-library/official-images#architectures-other-than-amd64 - arch: amd64 - runs-on: depot-ubuntu-22.04-16 + runs-on: depot-ubuntu-24.04-16 - arch: arm64v8 - runs-on: depot-ubuntu-22.04-arm-16 + runs-on: depot-ubuntu-24.04-arm-16 steps: - name: Checkout LLVM uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/commit-access-greeter.yml b/.github/workflows/commit-access-greeter.yml index 29a1b578f8af8..ef489b4d3c9a1 100644 --- a/.github/workflows/commit-access-greeter.yml +++ b/.github/workflows/commit-access-greeter.yml @@ -15,7 +15,7 @@ jobs: if: >- github.repository_owner == 'llvm' && github.event.label.name == 'infra:commit-access-request' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: diff --git a/.github/workflows/commit-access-review.yml b/.github/workflows/commit-access-review.yml index 5ab0ddd50d241..d401a137737c4 100644 --- a/.github/workflows/commit-access-review.yml +++ b/.github/workflows/commit-access-review.yml @@ -12,7 +12,7 @@ permissions: jobs: commit-access-review: if: github.repository_owner == 'llvm' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Fetch LLVM sources uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/release-asset-audit.yml b/.github/workflows/release-asset-audit.yml index 018c5d542f32e..8112d8a140810 100644 --- a/.github/workflows/release-asset-audit.yml +++ b/.github/workflows/release-asset-audit.yml @@ -19,7 +19,7 @@ permissions: jobs: audit: name: "Release Asset Audit" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.repository == 'llvm/llvm-project' steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6 diff --git a/.github/workflows/release-binaries-all.yml b/.github/workflows/release-binaries-all.yml index fd4694ebea32d..bfe1b00f51b52 100644 --- a/.github/workflows/release-binaries-all.yml +++ b/.github/workflows/release-binaries-all.yml @@ -57,7 +57,7 @@ jobs: setup-variables: if: >- (github.event_name != 'pull_request' || github.event.action != 'closed') - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: release-version: ${{ steps.vars.outputs.release-version }} upload: ${{ steps.vars.outputs.upload }} @@ -86,8 +86,8 @@ jobs: fail-fast: false matrix: runs-on: - - ubuntu-22.04 - - ubuntu-22.04-arm + - ubuntu-24.04 + - ubuntu-24.04-arm - macos-13 - macos-14 diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index fd6a6cc931ec4..1dc89c416ed07 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -17,8 +17,8 @@ on: required: true type: choice options: - - ubuntu-22.04 - - ubuntu-22.04-arm + - ubuntu-24.04 + - ubuntu-24.04-arm - macos-13 - macos-14 @@ -157,7 +157,7 @@ jobs: echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT echo "build-flang=$build_flang" >> $GITHUB_OUTPUT case "${{ inputs.runs-on }}" in - ubuntu-22.04*) + ubuntu-24.04*) build_runs_on="depot-${{ inputs.runs-on }}-16" test_runs_on=$build_runs_on ;; @@ -276,7 +276,7 @@ jobs: if: >- github.event_name != 'pull_request' && needs.prepare.outputs.upload == 'true' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: contents: write # For release uploads id-token: write # For artifact attestations From 6eedbc94461aac271ecda41474c039204a6a1a43 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Tue, 18 Mar 2025 19:16:34 +0000 Subject: [PATCH 2/2] feedback --- .github/workflows/release-binaries-all.yml | 6 ++++-- .github/workflows/release-binaries.yml | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-binaries-all.yml b/.github/workflows/release-binaries-all.yml index bfe1b00f51b52..0b52a08202f1a 100644 --- a/.github/workflows/release-binaries-all.yml +++ b/.github/workflows/release-binaries-all.yml @@ -85,9 +85,11 @@ jobs: strategy: fail-fast: false matrix: + # We use ubuntu-22.04 rather than the latest version to make the built + # binaries more portable (eg functional aginast older glibc). runs-on: - - ubuntu-24.04 - - ubuntu-24.04-arm + - ubuntu-22.04 + - ubuntu-22.04-arm - macos-13 - macos-14 diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index 1dc89c416ed07..c113b42dc8ed4 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -16,9 +16,11 @@ on: description: "Runner to use for the build" required: true type: choice + # We use ubuntu-22.04 rather than the latest version to make the built + # binaries more portable (eg functional aginast older glibc). options: - - ubuntu-24.04 - - ubuntu-24.04-arm + - ubuntu-22.04 + - ubuntu-22.04-arm - macos-13 - macos-14 @@ -157,7 +159,7 @@ jobs: echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT echo "build-flang=$build_flang" >> $GITHUB_OUTPUT case "${{ inputs.runs-on }}" in - ubuntu-24.04*) + ubuntu-22.04*) build_runs_on="depot-${{ inputs.runs-on }}-16" test_runs_on=$build_runs_on ;;