Skip to content

Commit eda65b9

Browse files
borsbors
committed
Auto merge of #127373 - ehuss:windows-in-use, r=<try>
[do not merge] Testing Windows CI
2 parents f25e92b + 7d8b49d commit eda65b9

File tree

3 files changed

+125
-28
lines changed

3 files changed

+125
-28
lines changed

‎.github/workflows/ci.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,17 @@ jobs:
188188
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
189189
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
190190

191-
- name: create github artifacts
192-
run: src/ci/scripts/create-doc-artifacts.sh
193-
194-
- name: upload artifacts to github
195-
uses: actions/upload-artifact@v4
196-
with:
197-
# name is set in previous step
198-
name: ${{ env.DOC_ARTIFACT_NAME }}
199-
path: obj/artifacts/doc
200-
if-no-files-found: ignore
201-
retention-days: 5
191+
# - name: create github artifacts
192+
# run: src/ci/scripts/create-doc-artifacts.sh
193+
194+
# - name: upload artifacts to github
195+
# uses: actions/upload-artifact@v4
196+
# with:
197+
# # name is set in previous step
198+
# name: ${{ env.DOC_ARTIFACT_NAME }}
199+
# path: obj/artifacts/doc
200+
# if-no-files-found: ignore
201+
# retention-days: 5
202202

203203
- name: upload artifacts to S3
204204
run: src/ci/scripts/upload-artifacts.sh

‎src/ci/github-actions/jobs.yml

+111-14
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ envs:
6868
# - not running `opt-dist`'s post-optimization smoke tests on the resulting toolchain
6969
#
7070
# If you *want* these to happen however, temporarily uncomment it before triggering a try build.
71-
DIST_TRY_BUILD: 1
71+
# DIST_TRY_BUILD: 1
7272

7373
auto:
7474
<<: *production
@@ -80,26 +80,123 @@ envs:
8080
# These jobs automatically inherit envs.pr, to avoid repeating
8181
# it in each job definition.
8282
pr:
83-
- image: mingw-check
84-
<<: *job-linux-4c
85-
- image: mingw-check-tidy
86-
continue_on_error: true
87-
<<: *job-linux-4c
88-
- image: x86_64-gnu-llvm-17
83+
- image: x86_64-msvc-ext1
8984
env:
90-
ENABLE_GCC_CODEGEN: "1"
91-
<<: *job-linux-16c
92-
- image: x86_64-gnu-tools
93-
<<: *job-linux-16c
85+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
86+
HOST_TARGET: x86_64-pc-windows-msvc
87+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
88+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
89+
<<: *job-windows-8c
90+
- image: x86_64-msvc-ext2
91+
env:
92+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
93+
HOST_TARGET: x86_64-pc-windows-msvc
94+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
95+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
96+
<<: *job-windows-8c
97+
- image: x86_64-msvc-ext3
98+
env:
99+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
100+
HOST_TARGET: x86_64-pc-windows-msvc
101+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
102+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
103+
<<: *job-windows-8c
104+
- image: x86_64-msvc-ext4
105+
env:
106+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
107+
HOST_TARGET: x86_64-pc-windows-msvc
108+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
109+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
110+
<<: *job-windows-8c
111+
- image: x86_64-msvc-ext5
112+
env:
113+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
114+
HOST_TARGET: x86_64-pc-windows-msvc
115+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
116+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
117+
<<: *job-windows-8c
118+
- image: x86_64-msvc-ext6
119+
env:
120+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
121+
HOST_TARGET: x86_64-pc-windows-msvc
122+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
123+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
124+
<<: *job-windows-8c
125+
- image: x86_64-msvc-ext7
126+
env:
127+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
128+
HOST_TARGET: x86_64-pc-windows-msvc
129+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
130+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
131+
<<: *job-windows-8c
132+
- image: x86_64-msvc-ext8
133+
env:
134+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
135+
HOST_TARGET: x86_64-pc-windows-msvc
136+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
137+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
138+
<<: *job-windows-8c
94139

95140
# Jobs that run when you perform a try build (@bors try)
96141
# These jobs automatically inherit envs.try, to avoid repeating
97142
# it in each job definition.
98143
try:
99-
- image: dist-x86_64-linux
144+
- image: x86_64-msvc-ext1
100145
env:
101-
CODEGEN_BACKENDS: llvm,cranelift
102-
<<: *job-linux-16c
146+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
147+
HOST_TARGET: x86_64-pc-windows-msvc
148+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
149+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
150+
<<: *job-windows-8c
151+
- image: x86_64-msvc-ext2
152+
env:
153+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
154+
HOST_TARGET: x86_64-pc-windows-msvc
155+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
156+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
157+
<<: *job-windows-8c
158+
- image: x86_64-msvc-ext3
159+
env:
160+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
161+
HOST_TARGET: x86_64-pc-windows-msvc
162+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
163+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
164+
<<: *job-windows-8c
165+
- image: x86_64-msvc-ext4
166+
env:
167+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
168+
HOST_TARGET: x86_64-pc-windows-msvc
169+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
170+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
171+
<<: *job-windows-8c
172+
- image: x86_64-msvc-ext5
173+
env:
174+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
175+
HOST_TARGET: x86_64-pc-windows-msvc
176+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
177+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
178+
<<: *job-windows-8c
179+
- image: x86_64-msvc-ext6
180+
env:
181+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
182+
HOST_TARGET: x86_64-pc-windows-msvc
183+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
184+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
185+
<<: *job-windows-8c
186+
- image: x86_64-msvc-ext7
187+
env:
188+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
189+
HOST_TARGET: x86_64-pc-windows-msvc
190+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
191+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
192+
<<: *job-windows-8c
193+
- image: x86_64-msvc-ext8
194+
env:
195+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
196+
HOST_TARGET: x86_64-pc-windows-msvc
197+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
198+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
199+
<<: *job-windows-8c
103200

104201
# Main CI jobs that have to be green to merge a commit into master
105202
# These jobs automatically inherit envs.auto, to avoid repeating

‎src/ci/run.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ if [ "$CI" != "" ]; then
5252
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set change-id=99999999"
5353
fi
5454

55-
if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \
56-
isCiBranch automation/bors/try; then
55+
# if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \
56+
# isCiBranch automation/bors/try; then
5757
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"
5858
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.metrics"
5959
HAS_METRICS=1
60-
fi
60+
# fi
6161

6262
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-verbose-configure"
6363
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache"

0 commit comments

Comments
 (0)