Skip to content

Commit ee7a610

Browse files
a-tarasyuka-tarasyuk
authored
Merge branch 'main' into feat/92196
2 parents a7873c3 + 89f119c commit ee7a610

File tree

587 files changed

+913665
-18784
lines changed

Some content is hidden

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

587 files changed

+913665
-18784
lines changed

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

Lines changed: 3 additions & 1 deletion
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
@@ -90,6 +92,6 @@ jobs:
9092
podman push ${{ needs.build-ci-container.outputs.container-name-tag }}
9193
podman push ${{ needs.build-ci-container.outputs.container-name }}:latest
9294
93-
podman tag ${{ needs.build-ci-container.outpus.container-name-agent-tag }} ${{ needs.build-ci-container.outputs.container-name-agent }}:latest
95+
podman tag ${{ needs.build-ci-container.outputs.container-name-agent-tag }} ${{ needs.build-ci-container.outputs.container-name-agent }}:latest
9496
podman push ${{ needs.build-ci-container.outputs.container-name-agent-tag }}
9597
podman push ${{ needs.build-ci-container.outputs.container-name-agent }}:latest

‎.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@v3
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@v3
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@v3
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@v3
165+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # 4.6.0
166166
with:
167167
name: compat-report-${{ github.sha }}
168168
path: compat_reports/

‎.github/workflows/libcxx-restart-preempted-jobs.yaml‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ jobs:
9292
check_run_id: check_run_id
9393
})
9494
95+
// For temporary debugging purposes to see the structure of the annotations.
96+
console.print(annotations);
97+
98+
has_failed_job = false;
99+
saved_failure_message = null;
100+
95101
for (annotation of annotations.data) {
96102
if (annotation.annotation_level != 'failure') {
97103
continue;
@@ -106,15 +112,32 @@ jobs:
106112
107113
const failure_match = annotation.message.match(failure_regex);
108114
if (failure_match != null) {
109-
// We only want to restart the workflow if all of the failures were due to preemption.
110-
// We don't want to restart the workflow if there were other failures.
111-
core.notice('Choosing not to rerun workflow because we found a non-preemption failure' +
112-
'Failure message: "' + annotation.message + '"');
113-
await create_check_run('skipped', 'Choosing not to rerun workflow because we found a non-preemption failure\n'
114-
+ 'Failure message: ' + annotation.message)
115-
return;
115+
has_failed_job = true;
116+
saved_failure_message = annotation.message;
116117
}
117118
}
119+
if (has_failed_job && (! has_preempted_job)) {
120+
// We only want to restart the workflow if all of the failures were due to preemption.
121+
// We don't want to restart the workflow if there were other failures.
122+
//
123+
// However, libcxx runners running inside docker containers produce both a preemption message and failure message.
124+
//
125+
// The desired approach is to ignore failure messages which appear on the same job as a preemption message
126+
// (An job is a single run with a specific configuration, ex generic-gcc, gcc-14).
127+
//
128+
// However, it's unclear that this code achieves the desired approach, and it may ignore all failures
129+
// if a preemption message is found at all on any run.
130+
//
131+
// For now, it's more important to restart preempted workflows than to avoid restarting workflows with
132+
// non-preemption failures.
133+
//
134+
// TODO Figure this out.
135+
core.notice('Choosing not to rerun workflow because we found a non-preemption failure' +
136+
'Failure message: "' + saved_failure_message + '"');
137+
await create_check_run('skipped', 'Choosing not to rerun workflow because we found a non-preemption failure\n'
138+
+ 'Failure message: ' + saved_failure_message)
139+
return;
140+
}
118141
}
119142
120143
if (!has_preempted_job) {

‎.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@v3
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@v3
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@v3
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@v3
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@v3
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@v3
189+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # 4.6.0
190190
with:
191191
name: compat-report-${{ github.sha }}
192192
path: compat_reports/

‎.github/workflows/premerge.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
pull_request:
88
paths:
99
- .github/workflows/premerge.yaml
10-
push:
11-
branches:
12-
- 'main'
1310

1411
jobs:
1512
premerge-checks-linux:
@@ -18,11 +15,6 @@ jobs:
1815
concurrency:
1916
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
2017
cancel-in-progress: true
21-
container:
22-
image: ghcr.io/llvm/ci-ubuntu-22.04:latest
23-
defaults:
24-
run:
25-
shell: bash
2618
steps:
2719
- name: Checkout LLVM
2820
uses: actions/checkout@v4

‎.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)