Skip to content

Commit ff702ef

Browse files
KobzolKobzol
committed
WIP
1 parent 68bacd5 commit ff702ef

File tree

2 files changed

+290
-9
lines changed

2 files changed

+290
-9
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 273 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,14 +606,286 @@ jobs:
606606
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
607607
AWS_REGION: us-west-1
608608
CACHE_DOMAIN: ci-caches.rust-lang.org
609-
if: "github.event_name == 'push' && (((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust') || ((github.ref == 'refs/heads/automation/bors/try') && github.repository == 'rust-lang/rust'))"
609+
if: "(\n (\n contains(github.event.head_commit.message, 'bors-workflow') &&\n contains(github.event.head_commit.message, format('bors-workflow: {0}', matrix.name))\n ) ||\n (\n !contains(github.event.head_commit.message, 'bors-workflow') &&\n matrix.name == 'dist-x86_64-linux'\n )\n) &&\ngithub.event_name == 'push' &&\n(\n ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust') ||\n ((github.ref == 'refs/heads/automation/bors/try') && github.repository == 'rust-lang/rust')\n)\n"
610610
strategy:
611611
matrix:
612612
include:
613+
- name: aarch64-gnu
614+
os:
615+
- self-hosted
616+
- ARM64
617+
- linux
618+
- name: arm-android
619+
os: ubuntu-20.04-8core-32gb
620+
env: {}
621+
- name: armhf-gnu
622+
os: ubuntu-20.04-8core-32gb
623+
env: {}
624+
- name: dist-aarch64-linux
625+
env:
626+
CODEGEN_BACKENDS: "llvm,cranelift"
627+
os: ubuntu-20.04-8core-32gb
628+
- name: dist-android
629+
os: ubuntu-20.04-8core-32gb
630+
env: {}
631+
- name: dist-arm-linux
632+
os: ubuntu-20.04-16core-64gb
633+
env: {}
634+
- name: dist-armhf-linux
635+
os: ubuntu-20.04-8core-32gb
636+
env: {}
637+
- name: dist-armv7-linux
638+
os: ubuntu-20.04-8core-32gb
639+
env: {}
640+
- name: dist-i586-gnu-i586-i686-musl
641+
os: ubuntu-20.04-8core-32gb
642+
env: {}
643+
- name: dist-i686-linux
644+
os: ubuntu-20.04-8core-32gb
645+
env: {}
646+
- name: dist-loongarch64-linux
647+
os: ubuntu-20.04-8core-32gb
648+
env: {}
649+
- name: dist-ohos
650+
os: ubuntu-20.04-8core-32gb
651+
env: {}
652+
- name: dist-powerpc-linux
653+
os: ubuntu-20.04-8core-32gb
654+
env: {}
655+
- name: dist-powerpc64-linux
656+
os: ubuntu-20.04-8core-32gb
657+
env: {}
658+
- name: dist-powerpc64le-linux
659+
os: ubuntu-20.04-8core-32gb
660+
env: {}
661+
- name: dist-riscv64-linux
662+
os: ubuntu-20.04-8core-32gb
663+
env: {}
664+
- name: dist-s390x-linux
665+
os: ubuntu-20.04-8core-32gb
666+
env: {}
667+
- name: dist-various-1
668+
os: ubuntu-20.04-8core-32gb
669+
env: {}
670+
- name: dist-various-2
671+
os: ubuntu-20.04-8core-32gb
672+
env: {}
673+
- name: dist-x86_64-freebsd
674+
os: ubuntu-20.04-8core-32gb
675+
env: {}
676+
- name: dist-x86_64-illumos
677+
os: ubuntu-20.04-8core-32gb
678+
env: {}
613679
- name: dist-x86_64-linux
614680
env:
615681
CODEGEN_BACKENDS: "llvm,cranelift"
616682
os: ubuntu-20.04-16core-64gb
683+
- name: dist-x86_64-linux-alt
684+
env:
685+
IMAGE: dist-x86_64-linux
686+
CODEGEN_BACKENDS: "llvm,cranelift"
687+
os: ubuntu-20.04-16core-64gb
688+
- name: dist-x86_64-musl
689+
env:
690+
CODEGEN_BACKENDS: "llvm,cranelift"
691+
os: ubuntu-20.04-8core-32gb
692+
- name: dist-x86_64-netbsd
693+
os: ubuntu-20.04-8core-32gb
694+
env: {}
695+
- name: i686-gnu
696+
os: ubuntu-20.04-8core-32gb
697+
env: {}
698+
- name: i686-gnu-nopt
699+
os: ubuntu-20.04-8core-32gb
700+
env: {}
701+
- name: mingw-check
702+
os: ubuntu-20.04-4core-16gb
703+
env: {}
704+
- name: test-various
705+
os: ubuntu-20.04-8core-32gb
706+
env: {}
707+
- name: x86_64-gnu
708+
os: ubuntu-20.04-4core-16gb
709+
env: {}
710+
- name: x86_64-gnu-stable
711+
env:
712+
IMAGE: x86_64-gnu
713+
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
714+
CI_ONLY_WHEN_CHANNEL: nightly
715+
os: ubuntu-20.04-4core-16gb
716+
- name: x86_64-gnu-aux
717+
os: ubuntu-20.04-4core-16gb
718+
env: {}
719+
- name: x86_64-gnu-integration
720+
env:
721+
CI_ONLY_WHEN_CHANNEL: nightly
722+
os: ubuntu-20.04-8core-32gb
723+
- name: x86_64-gnu-debug
724+
os: ubuntu-20.04-8core-32gb
725+
env: {}
726+
- name: x86_64-gnu-distcheck
727+
os: ubuntu-20.04-8core-32gb
728+
env: {}
729+
- name: x86_64-gnu-llvm-18
730+
env:
731+
RUST_BACKTRACE: 1
732+
os: ubuntu-20.04-8core-32gb
733+
- name: x86_64-gnu-llvm-17
734+
env:
735+
RUST_BACKTRACE: 1
736+
os: ubuntu-20.04-8core-32gb
737+
- name: x86_64-gnu-nopt
738+
os: ubuntu-20.04-4core-16gb
739+
env: {}
740+
- name: x86_64-gnu-tools
741+
env:
742+
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
743+
os: ubuntu-20.04-8core-32gb
744+
- name: dist-x86_64-apple
745+
env:
746+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
747+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1"
748+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
749+
MACOSX_DEPLOYMENT_TARGET: 10.12
750+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
751+
NO_LLVM_ASSERTIONS: 1
752+
NO_DEBUG_ASSERTIONS: 1
753+
NO_OVERFLOW_CHECKS: 1
754+
DIST_REQUIRE_ALL_TOOLS: 1
755+
CODEGEN_BACKENDS: "llvm,cranelift"
756+
os: macos-13
757+
- name: dist-apple-various
758+
env:
759+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
760+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
761+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
762+
MACOSX_DEPLOYMENT_TARGET: 10.12
763+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
764+
NO_LLVM_ASSERTIONS: 1
765+
NO_DEBUG_ASSERTIONS: 1
766+
NO_OVERFLOW_CHECKS: 1
767+
os: macos-13
768+
- name: x86_64-apple-1
769+
env:
770+
SCRIPT: "./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps"
771+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
772+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
773+
MACOSX_DEPLOYMENT_TARGET: 10.12
774+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
775+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
776+
NO_LLVM_ASSERTIONS: 1
777+
NO_DEBUG_ASSERTIONS: 1
778+
NO_OVERFLOW_CHECKS: 1
779+
os: macos-13
780+
- name: x86_64-apple-2
781+
env:
782+
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
783+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
784+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
785+
MACOSX_DEPLOYMENT_TARGET: 10.12
786+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
787+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
788+
NO_LLVM_ASSERTIONS: 1
789+
NO_DEBUG_ASSERTIONS: 1
790+
NO_OVERFLOW_CHECKS: 1
791+
os: macos-13
792+
- name: dist-aarch64-apple
793+
env:
794+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
795+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
796+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
797+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
798+
USE_XCODE_CLANG: 1
799+
MACOSX_DEPLOYMENT_TARGET: 11.0
800+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
801+
NO_LLVM_ASSERTIONS: 1
802+
NO_DEBUG_ASSERTIONS: 1
803+
NO_OVERFLOW_CHECKS: 1
804+
DIST_REQUIRE_ALL_TOOLS: 1
805+
os: macos-14
806+
- name: aarch64-apple
807+
env:
808+
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
809+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
810+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
811+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
812+
USE_XCODE_CLANG: 1
813+
MACOSX_DEPLOYMENT_TARGET: 11.0
814+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
815+
NO_LLVM_ASSERTIONS: 1
816+
NO_DEBUG_ASSERTIONS: 1
817+
NO_OVERFLOW_CHECKS: 1
818+
os: macos-14
819+
- name: x86_64-msvc
820+
env:
821+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
822+
SCRIPT: make ci-msvc
823+
os: windows-2019-8core-32gb
824+
- name: i686-msvc
825+
env:
826+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
827+
SCRIPT: make ci-msvc
828+
os: windows-2019-8core-32gb
829+
- name: x86_64-msvc-ext
830+
env:
831+
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
832+
HOST_TARGET: x86_64-pc-windows-msvc
833+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json"
834+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
835+
os: windows-2019-8core-32gb
836+
- name: i686-mingw
837+
env:
838+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
839+
SCRIPT: make ci-mingw
840+
NO_DOWNLOAD_CI_LLVM: 1
841+
CUSTOM_MINGW: 1
842+
os: windows-2019-8core-32gb
843+
- name: x86_64-mingw
844+
env:
845+
SCRIPT: make ci-mingw
846+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
847+
NO_DOWNLOAD_CI_LLVM: 1
848+
CUSTOM_MINGW: 1
849+
os: windows-2019-8core-32gb
850+
- name: dist-x86_64-msvc
851+
env:
852+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler --set rust.codegen-units=1"
853+
SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
854+
DIST_REQUIRE_ALL_TOOLS: 1
855+
os: windows-2019-8core-32gb
856+
- name: dist-i686-msvc
857+
env:
858+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler"
859+
SCRIPT: python x.py dist bootstrap --include-default-paths
860+
DIST_REQUIRE_ALL_TOOLS: 1
861+
os: windows-2019-8core-32gb
862+
- name: dist-aarch64-msvc
863+
env:
864+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
865+
SCRIPT: python x.py dist bootstrap --include-default-paths
866+
DIST_REQUIRE_ALL_TOOLS: 1
867+
os: windows-2019-8core-32gb
868+
- name: dist-i686-mingw
869+
env:
870+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu --enable-full-tools --enable-profiler"
871+
NO_DOWNLOAD_CI_LLVM: 1
872+
SCRIPT: python x.py dist bootstrap --include-default-paths
873+
CUSTOM_MINGW: 1
874+
DIST_REQUIRE_ALL_TOOLS: 1
875+
os: windows-2019-8core-32gb
876+
- name: dist-x86_64-mingw
877+
env:
878+
SCRIPT: python x.py dist bootstrap --include-default-paths
879+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler"
880+
NO_DOWNLOAD_CI_LLVM: 1
881+
CUSTOM_MINGW: 1
882+
DIST_REQUIRE_ALL_TOOLS: 1
883+
os: windows-2019-8core-32gb
884+
- name: dist-x86_64-msvc-alt
885+
env:
886+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-extended --enable-profiler"
887+
SCRIPT: python x.py dist bootstrap --include-default-paths
888+
os: windows-2019-8core-32gb
617889
defaults:
618890
run:
619891
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -758,15 +758,24 @@ jobs:
758758
env:
759759
DIST_TRY_BUILD: 1
760760
<<: [*shared-ci-variables, *prod-variables]
761-
if: github.event_name == 'push' && (((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust') || ((github.ref == 'refs/heads/automation/bors/try') && github.repository == 'rust-lang/rust'))
761+
if: |
762+
(
763+
(
764+
contains(github.event.head_commit.message, 'bors-workflow') &&
765+
contains(github.event.head_commit.message, format('bors-workflow: {0}', matrix.name))
766+
) ||
767+
(
768+
!contains(github.event.head_commit.message, 'bors-workflow') &&
769+
matrix.name == 'dist-x86_64-linux'
770+
)
771+
) &&
772+
github.event_name == 'push' &&
773+
(
774+
((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust') ||
775+
((github.ref == 'refs/heads/automation/bors/try') && github.repository == 'rust-lang/rust')
776+
)
762777
strategy:
763-
matrix:
764-
include:
765-
- &dist-x86_64-linux
766-
name: dist-x86_64-linux
767-
env:
768-
CODEGEN_BACKENDS: llvm,cranelift
769-
<<: *job-linux-16c
778+
<<: *full-matrix
770779

771780

772781
master:

0 commit comments

Comments
 (0)