WIP

Author: Kobzol

.github/workflows/ci.yml

@@ -92,9 +92,9 @@ jobs:
       # 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
       # less disk space.
-      - name: free up disk space
-        run: src/ci/scripts/free-disk-space.sh
-        if: matrix.free_disk
+      #      - name: free up disk space
+      #        run: src/ci/scripts/free-disk-space.sh
+      #if: matrix.free_disk
 
       # 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
@@ -208,7 +208,12 @@ jobs:
           retention-days: 5
 
       - name: upload artifacts to S3
-        run: src/ci/scripts/upload-artifacts.sh
+        run: |
+          echo "build"
+          ls -lha build
+          echo "obj/build"
+          ls -lha obj/build
+          src/ci/scripts/upload-artifacts.sh
         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)] }}
@@ -221,6 +226,10 @@ jobs:
 
       - name: postprocess metrics into the summary
         run: |
+          echo "build"
+          ls -lha build
+          echo "obj/build"
+          ls -lha obj/build
           if [ -f build/metrics.json ]; then
             ./build/citool/debug/citool postprocess-metrics build/metrics.json ${GITHUB_STEP_SUMMARY}
           elif [ -f obj/build/metrics.json ]; then

.gitmodules

@@ -47,7 +47,7 @@
 	path = src/tools/enzyme
 	url = https://github.com/EnzymeAD/Enzyme.git
 	shallow = true
-[submodule "src/gcc"]
-	path = src/gcc
-	url = https://github.com/rust-lang/gcc.git
-	shallow = true
+; [submodule "src/gcc"]
+; 	path = src/gcc
+; 	url = https://github.com/rust-lang/gcc.git
+; 	shallow = true

src/ci/citool/Cargo.toml

@@ -19,3 +19,7 @@ insta = "1"
 # If this is omitted, cargo will look for a workspace elsewhere.
 # We want to avoid this, since citool is independent of the other crates.
 [workspace]
+
+[profile.dev]
+debug = 0
+incremental = false

src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile

@@ -36,5 +36,4 @@ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
 
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
-ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
-           --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp
+ENV SCRIPT ../x.py build src/tools/build-manifest

src/ci/docker/host-x86_64/x86_64-gnu-llvm-18/Dockerfile

@@ -43,8 +43,8 @@ RUN sh /scripts/sccache.sh
 
 # We are disabling CI LLVM since this builder is intentionally using a host
 # LLVM, rather than the typical src/llvm-project LLVM.
-ENV NO_DOWNLOAD_CI_LLVM 1
-ENV EXTERNAL_LLVM 1
+#ENV NO_DOWNLOAD_CI_LLVM 1
+#ENV EXTERNAL_LLVM 1
 
 # Using llvm-link-shared due to libffi issues -- see #34486
 ENV RUST_CONFIGURE_ARGS \
@@ -55,9 +55,9 @@ ENV RUST_CONFIGURE_ARGS \
       --set rust.thin-lto-import-instr-limit=10
 
 COPY scripts/shared.sh /scripts/
-COPY scripts/build-gccjit.sh /scripts/
+#COPY scripts/build-gccjit.sh /scripts/
 
-RUN /scripts/build-gccjit.sh /scripts
+#RUN /scripts/build-gccjit.sh /scripts
 
 ARG SCRIPT_ARG
 

src/ci/docker/scripts/x86_64-gnu-llvm.sh

@@ -2,19 +2,21 @@
 
 set -ex
 
+../x.py build src/tools/build-manifest
+
 # NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
-../x.py --stage 2 test --skip src/tools/tidy
+#../x.py --stage 2 test --skip src/tools/tidy
 
 # Run the `mir-opt` tests again but this time for a 32-bit target.
 # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
 # both 32-bit and 64-bit outputs updated by the PR author, before
 # the PR is approved and tested for merging.
 # It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
 # despite having different output on 32-bit vs 64-bit targets.
-../x --stage 2 test tests/mir-opt --host='' --target=i686-unknown-linux-gnu
+#../x --stage 2 test tests/mir-opt --host='' --target=i686-unknown-linux-gnu
 
 # Run the UI test suite again, but in `--pass=check` mode
 #
 # This is intended to make sure that both `--pass=check` continues to
 # work.
-../x.ps1 --stage 2 test tests/ui --pass=check --host='' --target=i686-unknown-linux-gnu
+#../x.ps1 --stage 2 test tests/ui --pass=check --host='' --target=i686-unknown-linux-gnu

src/ci/run.sh

@@ -54,6 +54,9 @@ if [ "$FORCE_CI_RUSTC" == "" ]; then
     DISABLE_CI_RUSTC_IF_INCOMPATIBLE=1
 fi
 
+RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.metrics"
+HAS_METRICS=1
+
 if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \
   isCiBranch automation/bors/try; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"