nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 06:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge mingw-1/2 CI jobs

Browse Source
This commit is contained in:
Jakub Beránek 2023-06-15 08:49:51 +02:00
parent 0b475c705f
commit f3a4cf13a7
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
3 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/ci.yml vendored
View File

@ -414,30 +414,16 @@ jobs:
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json"
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
os: windows-2019-8core-32gb os: windows-2019-8core-32gb
- name: i686-mingw-1 - name: i686-mingw
env: env:
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu" RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
SCRIPT: make ci-mingw-subset-1 SCRIPT: make ci-mingw
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1
os: windows-2019-8core-32gb os: windows-2019-8core-32gb
- name: i686-mingw-2 - name: x86_64-mingw
env: env:
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu" SCRIPT: make ci-mingw
SCRIPT: make ci-mingw-subset-2
NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1
os: windows-2019-8core-32gb
- name: x86_64-mingw-1
env:
SCRIPT: make ci-mingw-subset-1
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1
os: windows-2019-8core-32gb
- name: x86_64-mingw-2
env:
SCRIPT: make ci-mingw-subset-2
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler" RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1

14
src/bootstrap/mk/Makefile.in
View File

@ -71,13 +71,11 @@ ci-subset-2:
## MingW native builders ## MingW native builders
TESTS_IN_MINGW_2 := \ # test both x and bootstrap entrypoints
tests/ui ci-mingw-x:
$(Q)$(CFG_SRC_DIR)/x test --stage 2 tidy
ci-mingw-subset-1: ci-mingw-bootstrap:
$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_2:%=--exclude %) $(Q)$(BOOTSTRAP) test --stage 2 --exclude tidy
ci-mingw-subset-2: ci-mingw: ci-mingw-x ci-mingw-bootstrap
$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2)
.PHONY: dist .PHONY: dist

30
src/ci/github-actions/ci.yml
View File

@ -635,41 +635,19 @@ jobs:
# came from the mingw-w64 SourceForge download site. Unfortunately # came from the mingw-w64 SourceForge download site. Unfortunately
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure. # SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
- name: i686-mingw-1 - name: i686-mingw
env: env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
SCRIPT: make ci-mingw-subset-1 SCRIPT: make ci-mingw
# We are intentionally allowing an old toolchain on this builder (and that's # We are intentionally allowing an old toolchain on this builder (and that's
# incompatible with LLVM downloads today). # incompatible with LLVM downloads today).
NO_DOWNLOAD_CI_LLVM: 1 NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1 CUSTOM_MINGW: 1
<<: *job-windows-8c <<: *job-windows-8c
- name: i686-mingw-2 - name: x86_64-mingw
env: env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu SCRIPT: make ci-mingw
SCRIPT: make ci-mingw-subset-2
# We are intentionally allowing an old toolchain on this builder (and that's
# incompatible with LLVM downloads today).
NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1
<<: *job-windows-8c
- name: x86_64-mingw-1
env:
SCRIPT: make ci-mingw-subset-1
RUST_CONFIGURE_ARGS: >-
--build=x86_64-pc-windows-gnu
--enable-profiler
# We are intentionally allowing an old toolchain on this builder (and that's
# incompatible with LLVM downloads today).
NO_DOWNLOAD_CI_LLVM: 1
CUSTOM_MINGW: 1
<<: *job-windows-8c
- name: x86_64-mingw-2
env:
SCRIPT: make ci-mingw-subset-2
RUST_CONFIGURE_ARGS: >- RUST_CONFIGURE_ARGS: >-
--build=x86_64-pc-windows-gnu --build=x86_64-pc-windows-gnu
--enable-profiler --enable-profiler