WIP: Test Windows CI in a dev drive

Author: GnomedDev

.github/workflows/ci.yml

@@ -60,7 +60,7 @@ jobs:
         id: jobs
   job:
     name: ${{ matrix.name }}
-    needs: [ calculate_matrix ]
+    needs: [calculate_matrix]
     runs-on: "${{ matrix.os }}"
     defaults:
       run:
@@ -104,6 +104,24 @@ jobs:
         with:
           fetch-depth: 2
 
+      - if: contains(matrix.os, 'windows')
+        uses: samypr100/setup-dev-drive@1d65529cfd809844a9e91e400a560294b6820a68
+        with:
+          # use as much space as is sensible, upper github limits are 14gb and 300gb
+          drive-size: ${{ matrix.os == 'windows-2022' && '12gb' || '100gb' }}
+          # pre-allocate the space to avoid out of disk errors and improve long-running performance
+          drive-type: Fixed
+          # copy the git clone into the dev drive
+          workspace-copy: true
+
+      - if: contains(matrix.os, 'windows')
+        name: Delete NTFS checkout, to make sure we aren't using it still
+        run: rm -rf ${{ github.workspace }}
+
+      - if: ${{ !contains(matrix.os, 'windows') }}
+        name: Make sure DEV_DRIVE_WORKSPACE is populated with the workspace
+        run: echo "DEV_DRIVE_WORKSPACE=${{ github.workspace }}" >> $GITHUB_ENV
+
       # Rust Log Analyzer can't currently detect the PR number of a GitHub
       # Actions build on its own, so a hint in the log message is needed to
       # point it in the right direction.
@@ -115,6 +133,7 @@ jobs:
 
       - name: add extra environment variables
         run: src/ci/scripts/setup-environment.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
         env:
           # Since it's not possible to merge `${{ matrix.env }}` with the other
           # variables in `job.<name>.env`, the variables defined in the matrix
@@ -124,48 +143,63 @@ jobs:
 
       - name: setup upstream remote
         run: src/ci/scripts/setup-upstream-remote.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: ensure the channel matches the target branch
         run: src/ci/scripts/verify-channel.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: collect CPU statistics
         run: src/ci/scripts/collect-cpu-stats.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: show the current environment
         run: src/ci/scripts/dump-environment.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: install awscli
         run: src/ci/scripts/install-awscli.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: install sccache
         run: src/ci/scripts/install-sccache.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: select Xcode
         run: src/ci/scripts/select-xcode.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: install clang
         run: src/ci/scripts/install-clang.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: install tidy
         run: src/ci/scripts/install-tidy.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: install WIX
         run: src/ci/scripts/install-wix.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: disable git crlf conversion
         run: src/ci/scripts/disable-git-crlf-conversion.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: checkout submodules
         run: src/ci/scripts/checkout-submodules.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: install MinGW
         run: src/ci/scripts/install-mingw.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: install ninja
         run: src/ci/scripts/install-ninja.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: enable ipv6 on Docker
         run: src/ci/scripts/enable-docker-ipv6.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       # Disable automatic line ending conversion (again). On Windows, when we're
       # installing dependencies, something switches the git configuration directory or
@@ -174,37 +208,44 @@ jobs:
       # appropriate line endings.
       - name: disable git crlf conversion
         run: src/ci/scripts/disable-git-crlf-conversion.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: ensure line endings are correct
         run: src/ci/scripts/verify-line-endings.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: ensure backported commits are in upstream branches
         run: src/ci/scripts/verify-backported-commits.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: ensure the stable version number is correct
         run: src/ci/scripts/verify-stable-version-number.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - 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
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
         env:
           AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
 
       - name: create github artifacts
         run: src/ci/scripts/create-doc-artifacts.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
 
       - name: upload artifacts to github
         uses: actions/upload-artifact@v4
         with:
           # name is set in previous step
           name: ${{ env.DOC_ARTIFACT_NAME }}
-          path: obj/artifacts/doc
+          path: ${{ env.DEV_DRIVE_WORKSPACE }}obj/artifacts/doc
           if-no-files-found: ignore
           retention-days: 5
 
       - name: upload artifacts to S3
         run: src/ci/scripts/upload-artifacts.sh
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
         env:
           AWS_ACCESS_KEY_ID: ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
@@ -217,6 +258,7 @@ jobs:
 
       - name: upload job metrics to DataDog
         if: needs.calculate_matrix.outputs.run_type != 'pr'
+        working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}
         env:
           DATADOG_SITE: datadoghq.com
           DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
@@ -230,7 +272,7 @@ jobs:
   outcome:
     name: bors build finished
     runs-on: ubuntu-latest
-    needs: [ calculate_matrix, job ]
+    needs: [calculate_matrix, job]
     # !cancelled() executes the job regardless of whether the previous jobs passed or failed
     if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}
     steps:

src/ci/github-actions/jobs.yml

@@ -2,7 +2,7 @@
 # dynamically in CI from ci.yml.
 runners:
   - &base-job
-    env: { }
+    env: {}
 
   - &job-linux-4c
     os: ubuntu-20.04-4core-16gb
@@ -51,8 +51,7 @@ envs:
     NO_DEBUG_ASSERTIONS: 1
     NO_OVERFLOW_CHECKS: 1
 
-  production:
-    &production
+  production: &production
     DEPLOY_BUCKET: rust-lang-ci2
     # AWS_SECRET_ACCESS_KEYs are stored in GitHub's secrets storage, named
     # AWS_SECRET_ACCESS_KEY_<keyid>. Including the key id in the name allows to
@@ -84,19 +83,11 @@ envs:
 # These jobs automatically inherit envs.pr, to avoid repeating
 # it in each job definition.
 pr:
-  - image: mingw-check
-    <<: *job-linux-4c
-  - image: mingw-check-tidy
-    continue_on_error: true
-    <<: *job-linux-4c
-  - image: x86_64-gnu-llvm-18
+  - image: x86_64-msvc
     env:
-      ENABLE_GCC_CODEGEN: "1"
-      # We are adding (temporarily) a dummy commit on the compiler
-      READ_ONLY_SRC: "0"
-    <<: *job-linux-16c
-  - image: x86_64-gnu-tools
-    <<: *job-linux-16c
+      RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
+      SCRIPT: make ci-msvc
+    <<: *job-windows-8c
 
 # Jobs that run when you perform a try build (@bors try)
 # These jobs automatically inherit envs.try, to avoid repeating