From 919758eeb631e7895456dceab57dff14641507f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 27 Feb 2025 19:48:40 +0100 Subject: [PATCH 1/4] Windows go brrr --- src/ci/github-actions/jobs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 64e64867de26f..279c7649ca3d0 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -474,13 +474,13 @@ auto: env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers SCRIPT: make ci-msvc-py - <<: *job-windows + <<: *job-windows-8c - name: i686-msvc-2 env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers SCRIPT: make ci-msvc-ps1 - <<: *job-windows + <<: *job-windows-8c # x86_64-msvc-ext is split into multiple jobs to run tests in parallel. - name: x86_64-msvc-ext1 @@ -595,7 +595,7 @@ auto: SCRIPT: python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 CODEGEN_BACKENDS: llvm,cranelift - <<: *job-windows + <<: *job-windows-8c - name: dist-aarch64-msvc env: From 86a6c77f93e918200ea406b0e0a7ba85e4a7b8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 27 Feb 2025 19:53:51 +0100 Subject: [PATCH 2/4] WIP --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de144ee6104c5..ee86baa0ff6a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,6 +86,10 @@ jobs: with: fetch-depth: 2 + - run: | + cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 && set' >> "$GITHUB_ENV" + cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 && set' + # Free up disk space on Linux by removing preinstalled components that # we do not need. We do this to enable some of the less resource # intensive jobs to run on free runners, which however also have @@ -179,6 +183,9 @@ jobs: - name: show the current environment run: src/ci/scripts/dump-environment.sh + - run: | + "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 >NUL & set > %GITHUB_ENV% + - name: run the build # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs. run: src/ci/scripts/run-build-from-ci.sh 2>&1 From 49e31b216e189cbd47bd25f4cb8c4a975f65058f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 27 Feb 2025 19:54:27 +0100 Subject: [PATCH 3/4] WIP --- src/ci/github-actions/jobs.yml | 36 ++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 279c7649ca3d0..7c979d60ea23f 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -100,20 +100,30 @@ envs: # These jobs automatically inherit envs.pr, to avoid repeating # it in each job definition. pr: - - name: mingw-check - <<: *job-linux-4c - - name: mingw-check-tidy - continue_on_error: true - <<: *job-linux-4c - - name: x86_64-gnu-llvm-18 + - name: i686-msvc-1 env: - ENABLE_GCC_CODEGEN: "1" - # We are adding (temporarily) a dummy commit on the compiler - READ_ONLY_SRC: "0" - DOCKER_SCRIPT: x86_64-gnu-llvm.sh - <<: *job-linux-16c - - name: x86_64-gnu-tools - <<: *job-linux-16c + RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers + SCRIPT: make ci-msvc-py + <<: *job-windows-8c + + - name: i686-msvc-2 + env: + RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers + SCRIPT: make ci-msvc-ps1 + <<: *job-windows-8c + + - name: dist-i686-msvc + env: + 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 + SCRIPT: python x.py dist bootstrap --include-default-paths + DIST_REQUIRE_ALL_TOOLS: 1 + CODEGEN_BACKENDS: llvm,cranelift + <<: *job-windows-8c # Jobs that run when you perform a try build (@bors try) # These jobs automatically inherit envs.try, to avoid repeating From 637310fc4e9fc2382c5ef6416cb396197b551aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 27 Feb 2025 19:58:16 +0100 Subject: [PATCH 4/4] WIP --- .github/workflows/ci.yml | 29 +++++++++++++++++++++------ src/ci/github-actions/jobs.yml | 36 ++++++++++++---------------------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee86baa0ff6a4..b19f865cb9f31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,9 +86,29 @@ jobs: with: fetch-depth: 2 - - run: | - cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 && set' >> "$GITHUB_ENV" - cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 && set' +# - run: | +# cmd.exe /c 'set' +# cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 uwp 10.0.22621.0' +# cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 uwp 10.0.22621.0 & set' +# cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 uwp 10.0.22621.0 & set' 2> out.txt +# echo "ENVS" +# cat out.txt +# cat out.txt >> "$GITHUB_ENV" + + - name: show the current environment + run: src/ci/scripts/dump-environment.sh + + - shell: cmd + run: "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 >NUL & set > %GITHUB_ENV% + + - name: show the current environment + run: src/ci/scripts/dump-environment.sh + + - shell: pwsh + run: "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 >NUL & set > %GITHUB_ENV% + + - name: show the current environment + run: src/ci/scripts/dump-environment.sh # Free up disk space on Linux by removing preinstalled components that # we do not need. We do this to enable some of the less resource @@ -183,9 +203,6 @@ jobs: - name: show the current environment run: src/ci/scripts/dump-environment.sh - - run: | - "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 >NUL & set > %GITHUB_ENV% - - name: run the build # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs. run: src/ci/scripts/run-build-from-ci.sh 2>&1 diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 7c979d60ea23f..279c7649ca3d0 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -100,30 +100,20 @@ envs: # These jobs automatically inherit envs.pr, to avoid repeating # it in each job definition. pr: - - name: i686-msvc-1 - env: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers - SCRIPT: make ci-msvc-py - <<: *job-windows-8c - - - name: i686-msvc-2 - env: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers - SCRIPT: make ci-msvc-ps1 - <<: *job-windows-8c - - - name: dist-i686-msvc + - name: mingw-check + <<: *job-linux-4c + - name: mingw-check-tidy + continue_on_error: true + <<: *job-linux-4c + - name: x86_64-gnu-llvm-18 env: - 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 - SCRIPT: python x.py dist bootstrap --include-default-paths - DIST_REQUIRE_ALL_TOOLS: 1 - CODEGEN_BACKENDS: llvm,cranelift - <<: *job-windows-8c + ENABLE_GCC_CODEGEN: "1" + # We are adding (temporarily) a dummy commit on the compiler + READ_ONLY_SRC: "0" + DOCKER_SCRIPT: x86_64-gnu-llvm.sh + <<: *job-linux-16c + - name: x86_64-gnu-tools + <<: *job-linux-16c # Jobs that run when you perform a try build (@bors try) # These jobs automatically inherit envs.try, to avoid repeating