Skip to content

Commit df5f3c3

Browse files
committed
Merge from 'main' to 'sycl-web' (135 commits)
CONFLICT (content): Merge conflict in .github/workflows/libclang-abi-tests.yml CONFLICT (content): Merge conflict in .github/workflows/llvm-tests.yml CONFLICT (content): Merge conflict in .github/workflows/release-documentation.yml
2 parents 053795b + b4576bb commit df5f3c3

File tree

685 files changed

+958761
-28912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

685 files changed

+958761
-28912
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
runs-on: depot-ubuntu-22.04-16
2424
outputs:
2525
container-name: ${{ steps.vars.outputs.container-name }}
26+
container-name-agent: ${{ steps.vars.outputs.container-name-agent }}
2627
container-name-tag: ${{ steps.vars.outputs.container-name-tag }}
28+
container-name-agent-tag: ${{ steps.vars.outputs.container-name-agent-tag }}
2729
container-filename: ${{ steps.vars.outputs.container-filename }}
2830
steps:
2931
- name: Checkout LLVM
@@ -36,19 +38,22 @@ jobs:
3638
tag=`date +%s`
3739
container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/ci-ubuntu-22.04"
3840
echo "container-name=$container_name" >> $GITHUB_OUTPUT
41+
echo "container-name-agent=$container_name-agent" >> $GITHUB_OUTPUT
3942
echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT
43+
echo "container-name-agent-tag=$container_name-agent:$tag" >> $GITHUB_OUTPUT
4044
echo "container-filename=$(echo $container_name:$tag | sed -e 's/\//-/g' -e 's/:/-/g').tar" >> $GITHUB_OUTPUT
4145
- name: Build container
4246
working-directory: ./.github/workflows/containers/github-action-ci/
4347
run: |
44-
podman build -t ${{ steps.vars.outputs.container-name-tag }} .
48+
podman build --target ci-container -t ${{ steps.vars.outputs.container-name-tag }} .
49+
podman build --target ci-container-agent -t ${{ steps.vars.outputs.container-name-agent-tag }} .
4550
4651
# Save the container so we have it in case the push fails. This also
4752
# allows us to separate the push step into a different job so we can
4853
# maintain minimal permissions while building the container.
4954
- name: Save container image
5055
run: |
51-
podman save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }}
56+
podman save ${{ steps.vars.outputs.container-name-tag }} ${{ steps.vars.outputs.container-name-agent-tag }} > ${{ steps.vars.outputs.container-filename }}
5257
5358
- name: Upload container image
5459
uses: actions/upload-artifact@v4
@@ -86,3 +91,7 @@ jobs:
8691
podman login -u ${{ github.actor }} -p $GITHUB_TOKEN ghcr.io
8792
podman push ${{ needs.build-ci-container.outputs.container-name-tag }}
8893
podman push ${{ needs.build-ci-container.outputs.container-name }}:latest
94+
95+
podman tag ${{ needs.build-ci-container.outputs.container-name-agent-tag }} ${{ needs.build-ci-container.outputs.container-name-agent }}:latest
96+
podman push ${{ needs.build-ci-container.outputs.container-name-agent-tag }}
97+
podman push ${{ needs.build-ci-container.outputs.container-name-agent }}:latest

.github/workflows/containers/github-action-ci/Dockerfile

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ RUN apt-get update && \
1313
ninja-build \
1414
python3 \
1515
git \
16-
curl
16+
curl \
17+
zlib1g-dev
1718

1819
RUN curl -O -L https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$LLVM_VERSION.tar.gz && tar -xf llvmorg-$LLVM_VERSION.tar.gz
1920

@@ -38,7 +39,7 @@ RUN cmake -B ./build -G Ninja ./llvm \
3839

3940
RUN ninja -C ./build stage2-clang-bolt stage2-install-distribution && ninja -C ./build install-distribution
4041

41-
FROM base
42+
FROM base as ci-container
4243

4344
COPY --from=stage1-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
4445

@@ -91,4 +92,15 @@ RUN adduser gha sudo
9192
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
9293

9394
USER gha
95+
WORKDIR /home/gha
96+
97+
FROM ci-container as ci-container-agent
98+
99+
ENV GITHUB_RUNNER_VERSION=2.321.0
100+
101+
RUN mkdir actions-runner && \
102+
cd actions-runner && \
103+
curl -O -L https://github.com/actions/runner/releases/download/v$GITHUB_RUNNER_VERSION/actions-runner-linux-x64-$GITHUB_RUNNER_VERSION.tar.gz && \
104+
tar xzf ./actions-runner-linux-x64-$GITHUB_RUNNER_VERSION.tar.gz && \
105+
rm ./actions-runner-linux-x64-$GITHUB_RUNNER_VERSION.tar.gz
94106

.github/workflows/libclang-abi-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
sed -i 's/LLVM_[0-9]\+/LLVM_NOVERSION/' $lib-${{ matrix.ref }}.abi
131131
done
132132
- name: Upload ABI file
133-
uses: actions/upload-artifact@v4
133+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # 4.6.0
134134
with:
135135
name: ${{ matrix.name }}
136136
path: '*${{ matrix.ref }}.abi'
@@ -143,12 +143,12 @@ jobs:
143143
- abi-dump
144144
steps:
145145
- name: Download baseline
146-
uses: actions/download-artifact@v4
146+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # 4.1.8
147147
with:
148148
name: build-baseline
149149
path: build-baseline
150150
- name: Download latest
151-
uses: actions/download-artifact@v4
151+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # 4.1.8
152152
with:
153153
name: build-latest
154154
path: build-latest
@@ -162,7 +162,7 @@ jobs:
162162
done
163163
- name: Upload ABI Comparison
164164
if: always()
165-
uses: actions/upload-artifact@v4
165+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # 4.6.0
166166
with:
167167
name: compat-report-${{ github.sha }}
168168
path: compat_reports/

.github/workflows/llvm-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ jobs:
137137
# Remove symbol versioning from dumps, so we can compare across major versions.
138138
sed -i 's/LLVM_${{ matrix.llvm_version_major }}/LLVM_NOVERSION/' ${{ matrix.ref }}.abi
139139
- name: Upload ABI file
140-
uses: actions/upload-artifact@v4
140+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # 4.6.0
141141
with:
142142
name: ${{ matrix.name }}
143143
path: ${{ matrix.ref }}.abi
144144

145145
- name: Upload symbol list file
146146
if: matrix.name == 'build-baseline'
147-
uses: actions/upload-artifact@v4
147+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # 4.6.0
148148
with:
149149
name: symbol-list
150150
path: llvm.symbols
@@ -157,17 +157,17 @@ jobs:
157157
- abi-dump
158158
steps:
159159
- name: Download baseline
160-
uses: actions/download-artifact@v4
160+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # 4.1.8
161161
with:
162162
name: build-baseline
163163
path: build-baseline
164164
- name: Download latest
165-
uses: actions/download-artifact@v4
165+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # 4.1.8
166166
with:
167167
name: build-latest
168168
path: build-latest
169169
- name: Download symbol list
170-
uses: actions/download-artifact@v4
170+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # 4.1.8
171171
with:
172172
name: symbol-list
173173
path: symbol-list
@@ -186,7 +186,7 @@ jobs:
186186
abi-compliance-checker $EXTRA_ARGS -l libLLVM.so -old build-baseline/*.abi -new build-latest/*.abi || test "${{ needs.abi-dump-setup.outputs.ABI_HEADERS }}" = "llvm-c"
187187
- name: Upload ABI Comparison
188188
if: always()
189-
uses: actions/upload-artifact@v4
189+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # 4.6.0
190190
with:
191191
name: compat-report-${{ github.sha }}
192192
path: compat_reports/

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ jobs:
8383
matrix:
8484
runs-on:
8585
- ubuntu-22.04
86-
- windows-2022
8786
- macos-13
8887
- macos-14
8988

0 commit comments

Comments
 (0)