diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee86baa0ff6a4..7da6ef4b6942c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,8 +87,13 @@ jobs:
           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'
+          cmd.exe /c 'set'
+          cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0'
+          cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 & set'
+          cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 & set' 2> out.txt
+          echo "ENVS"
+          cat out.txt
+          cat out.txt >> "$GITHUB_ENV"
 
       # 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 +188,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