Skip to content

Commit 3cfd1de

Browse files
committed
Merge from 'main' to 'sycl-web' (6 commits)
CONFLICT (content): Merge conflict in clang/lib/CodeGen/CGBuiltin.cpp
2 parents e341daf + 7f920e2 commit 3cfd1de

40 files changed

+20347
-19579
lines changed

.github/workflows/build-ci-container.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
# The arch names should match the names used on dockerhub.
2828
# See https://github.com/docker-library/official-images#architectures-other-than-amd64
2929
- arch: amd64
30-
runs-on: depot-ubuntu-22.04-16
30+
runs-on: depot-ubuntu-24.04-16
3131
- arch: arm64v8
32-
runs-on: depot-ubuntu-22.04-arm-16
32+
runs-on: depot-ubuntu-24.04-arm-16
3333
steps:
3434
- name: Checkout LLVM
3535
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/commit-access-greeter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: >-
1616
github.repository_owner == 'llvm' &&
1717
github.event.label.name == 'infra:commit-access-request'
18-
runs-on: ubuntu-22.04
18+
runs-on: ubuntu-24.04
1919
steps:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2121
with:

.github/workflows/commit-access-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
commit-access-review:
1414
if: github.repository_owner == 'llvm'
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- name: Fetch LLVM sources
1818
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/release-asset-audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
audit:
2121
name: "Release Asset Audit"
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
if: github.repository == 'llvm/llvm-project'
2424
steps:
2525
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6

.github/workflows/release-binaries-all.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
setup-variables:
5858
if: >-
5959
(github.event_name != 'pull_request' || github.event.action != 'closed')
60-
runs-on: ubuntu-22.04
60+
runs-on: ubuntu-24.04
6161
outputs:
6262
release-version: ${{ steps.vars.outputs.release-version }}
6363
upload: ${{ steps.vars.outputs.upload }}
@@ -85,6 +85,8 @@ jobs:
8585
strategy:
8686
fail-fast: false
8787
matrix:
88+
# We use ubuntu-22.04 rather than the latest version to make the built
89+
# binaries more portable (eg functional aginast older glibc).
8890
runs-on:
8991
- ubuntu-22.04
9092
- ubuntu-22.04-arm

.github/workflows/release-binaries.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ on:
1616
description: "Runner to use for the build"
1717
required: true
1818
type: choice
19+
# We use ubuntu-22.04 rather than the latest version to make the built
20+
# binaries more portable (eg functional aginast older glibc).
1921
options:
2022
- ubuntu-22.04
2123
- ubuntu-22.04-arm
@@ -276,7 +278,7 @@ jobs:
276278
if: >-
277279
github.event_name != 'pull_request' &&
278280
needs.prepare.outputs.upload == 'true'
279-
runs-on: ubuntu-22.04
281+
runs-on: ubuntu-24.04
280282
permissions:
281283
contents: write # For release uploads
282284
id-token: write # For artifact attestations

0 commit comments

Comments
 (0)