Merge pull request #998 from rust-lang/rustfmt

Migrate code formatting to the orchestrator
rust-lang · Nov 20, 2023 · b4f8269 · b4f8269
2 parents ece84a8 + 44fb0bd
commit b4f8269
Show file tree

Hide file tree

Showing 15 changed files with 576 additions and 285 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -101,50 +101,22 @@ jobs:
       uses: dtolnay/rust-toolchain@stable
       with:
         components: rustfmt
-    - name: Cache Cargo intermediate products
-      uses: actions/cache@v3
-      with:
-        path: |-
-          ~/.cargo/registry
-          ~/.cargo/git
-          ui/target
-        key: "${{ runner.os }}-cargo-${{ hashFiles('ui/**/Cargo.lock') }}-2"
     - name: Format server
       run: cargo fmt --manifest-path ui/Cargo.toml --all --check
     - name: Format top-crates
       run: cargo fmt --manifest-path top-crates/Cargo.toml --check
     - name: Format orchestrator
       run: cargo fmt --manifest-path compiler/base/orchestrator/Cargo.toml --check
     - name: Build backend
-      run: |-
-        mkdir -p ui/target; docker run --rm -v $PWD/compiler/base/asm-cleanup:/compiler/base/asm-cleanup -v $PWD/compiler/base/orchestrator:/compiler/base/orchestrator -v $PWD/compiler/base/modify-cargo-toml:/compiler/base/modify-cargo-toml -v $PWD/ui:/ui -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry --workdir /ui rust:alpine sh -c '
-          apk add musl-dev openssl-dev openssl-libs-static
-
-          # Adding -C relocation-model=static due to
-          # https://github.com/rust-lang/rust/issues/95926
-
-          # Adding this to find the statically-built version
-          export OPENSSL_NO_PKG_CONFIG=1 OPENSSL_STATIC=1 OPENSSL_DIR=/usr/
-
-          # Unit tests
-          cargo rustc --tests --locked -- -C relocation-model=static;
-
-          test_bin=$(find target/debug/deps/ -name "ui*" -type f -perm -a=x);
-          mv "${test_bin}" target/unit_tests;
-
-          # Primary binary
-          cargo rustc --locked --release -- -C relocation-model=static;
-          mv target/release/ui target/ui;
-        '
-    - name: Restore permissions
-      run: sudo chown -R runner:docker ~/.cargo/ ui/target
+      run: "./ci/build-backend.sh"
     - name: Save backend artifact
       uses: actions/upload-artifact@v3
       with:
         name: backend
         path: |
-          ui/target/ui
-          ui/target/unit_tests
+          docker-output/ui
+          docker-output/unit_tests_ui
+          docker-output/unit_tests_orchestrator
   build_frontend:
     name: Build frontend
     runs-on: ubuntu-latest
@@ -249,8 +221,13 @@ jobs:
       with:
         name: frontend
         path: tests/server/build/
-    - name: Run unit tests
-      run: chmod +x ./server/unit_tests && ./server/unit_tests
+    - name: Run orchestrator unit tests
+      env:
+        TESTS_MAX_CONCURRENCY: 3
+        TESTS_TIMEOUT_MS: 30000
+      run: chmod +x ./server/unit_tests_orchestrator && ./server/unit_tests_orchestrator
+    - name: Run ui unit tests
+      run: chmod +x ./server/unit_tests_ui && ./server/unit_tests_ui
     - name: Run tests
       env:
         PLAYGROUND_UI_ROOT: server/build/

diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -0,0 +1,34 @@
+FROM rust:alpine
+
+RUN apk add musl-dev openssl-dev openssl-libs-static
+
+# Adding -C relocation-model=static due to
+# https://github.com/rust-lang/rust/issues/95926
+
+# Adding this to find the statically-built version
+ENV OPENSSL_NO_PKG_CONFIG=1 OPENSSL_STATIC=1 OPENSSL_DIR=/usr/
+
+RUN mkdir /output
+
+COPY compiler/base/asm-cleanup /compiler/base/asm-cleanup
+COPY compiler/base/orchestrator /compiler/base/orchestrator
+COPY compiler/base/modify-cargo-toml /compiler/base/modify-cargo-toml
+COPY ui /ui
+
+WORKDIR /compiler/base/orchestrator
+
+RUN \
+    cargo rustc --profile test --lib --locked -- --cfg force_docker -C relocation-model=static; \
+    test_bin=$(find target/debug/deps/ -name "orchestrator*" -type f -perm -a=x); \
+    mv "${test_bin}" /output/unit_tests_orchestrator;
+
+WORKDIR /ui
+
+RUN \
+    cargo rustc --tests --locked -- -C relocation-model=static; \
+    test_bin=$(find target/debug/deps/ -name "ui*" -type f -perm -a=x); \
+    mv "${test_bin}" /output/unit_tests_ui;
+
+RUN \
+    cargo rustc --locked --release -- -C relocation-model=static; \
+    mv target/release/ui /output/ui;
diff --git a/ci/Dockerfile.dockerignore b/ci/Dockerfile.dockerignore
@@ -0,0 +1,10 @@
+*
+!compiler/base/asm-cleanup/**
+compiler/base/asm-cleanup/target
+!compiler/base/orchestrator/**
+compiler/base/orchestrator/target
+!compiler/base/modify-cargo-toml/**
+compiler/base/modify-cargo-toml/target
+!ui/**
+ui/frontend
+ui/target
diff --git a/ci/build-backend.sh b/ci/build-backend.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -eu
+
+IMAGE_NAME=backend-build
+OUTPUT_DIR=docker-output
+
+docker build -t "${IMAGE_NAME}" -f ci/Dockerfile .
+
+mkdir -p "${OUTPUT_DIR}"
+
+container_id=$(docker create "${IMAGE_NAME}")
+for f in unit_tests_orchestrator unit_tests_ui ui; do
+    docker cp "${container_id}:/output/${f}" "${OUTPUT_DIR}"
+done
+docker rm -f "${container_id}"
diff --git a/ci/workflows.yml b/ci/workflows.yml
@@ -177,15 +177,6 @@ workflows:
             with:
               components: rustfmt
 
-          - name: "Cache Cargo intermediate products"
-            uses: actions/cache@v3
-            with:
-              path: |-
-                ~/.cargo/registry
-                ~/.cargo/git
-                ui/target
-              key: ${{ runner.os }}-cargo-${{ hashFiles('ui/**/Cargo.lock') }}-2
-
           - name: "Format server"
             run: cargo fmt --manifest-path ui/Cargo.toml --all --check
 
@@ -196,50 +187,16 @@ workflows:
             run: cargo fmt --manifest-path compiler/base/orchestrator/Cargo.toml --check
 
           - name: "Build backend"
-            run: >-
-                mkdir -p ui/target;
-                docker
-                run
-                --rm
-                -v $PWD/compiler/base/asm-cleanup:/compiler/base/asm-cleanup
-                -v $PWD/compiler/base/orchestrator:/compiler/base/orchestrator
-                -v $PWD/compiler/base/modify-cargo-toml:/compiler/base/modify-cargo-toml
-                -v $PWD/ui:/ui
-                -v ~/.cargo/git:/root/.cargo/git
-                -v ~/.cargo/registry:/root/.cargo/registry
-                --workdir /ui
-                rust:alpine
-                sh -c '
-                  apk add musl-dev openssl-dev openssl-libs-static
-
-                  # Adding -C relocation-model=static due to
-                  # https://github.com/rust-lang/rust/issues/95926
-
-                  # Adding this to find the statically-built version
-                  export OPENSSL_NO_PKG_CONFIG=1 OPENSSL_STATIC=1 OPENSSL_DIR=/usr/
-
-                  # Unit tests
-                  cargo rustc --tests --locked -- -C relocation-model=static;
-
-                  test_bin=$(find target/debug/deps/ -name "ui*" -type f -perm -a=x);
-                  mv "${test_bin}" target/unit_tests;
-
-                  # Primary binary
-                  cargo rustc --locked --release -- -C relocation-model=static;
-                  mv target/release/ui target/ui;
-                '
-
-          - name: "Restore permissions"
-            run: >-
-              sudo chown -R runner:docker ~/.cargo/ ui/target
+            run: ./ci/build-backend.sh
 
           - name: "Save backend artifact"
             uses: actions/upload-artifact@v3
             with:
               name: backend
               path: |
-                ui/target/ui
-                ui/target/unit_tests
+                docker-output/ui
+                docker-output/unit_tests_ui
+                docker-output/unit_tests_orchestrator
 
       build_frontend:
         name: "Build frontend"
@@ -354,9 +311,16 @@ workflows:
               name: frontend
               path: tests/server/build/
 
-          - name: "Run unit tests"
+          - name: "Run orchestrator unit tests"
+            env:
+              TESTS_MAX_CONCURRENCY: 3
+              TESTS_TIMEOUT_MS: 30000
+            run: |-
+              chmod +x ./server/unit_tests_orchestrator && ./server/unit_tests_orchestrator
+
+          - name: "Run ui unit tests"
             run: |-
-              chmod +x ./server/unit_tests && ./server/unit_tests
+              chmod +x ./server/unit_tests_ui && ./server/unit_tests_ui
 
           - name: "Run tests"
             env:

diff --git a/compiler/base/Cargo.toml b/compiler/base/Cargo.toml
@@ -560,7 +560,7 @@ version = "=2.1.0"
 
 [dependencies.hyper]
 package = "hyper"
-version = "=1.0.0"
+version = "=1.0.1"
 features = ["client", "full", "http1", "http2", "server"]
 
 [dependencies.hyper_0_14_27]
@@ -1464,7 +1464,7 @@ version = "=0.7.26"
 
 [dependencies.zeroize]
 package = "zeroize"
-version = "=1.6.1"
+version = "=1.7.0"
 default-features = false
 
 [dependencies.zune_inflate]
@@ -2013,7 +2013,7 @@ version = "=2.1.0"
 
 [build_dependencies.hyper]
 package = "hyper"
-version = "=1.0.0"
+version = "=1.0.1"
 features = ["client", "full", "http1", "http2", "server"]
 
 [build_dependencies.hyper_0_14_27]
@@ -2917,7 +2917,7 @@ version = "=0.7.26"
 
 [build_dependencies.zeroize]
 package = "zeroize"
-version = "=1.6.1"
+version = "=1.7.0"
 default-features = false
 
 [build_dependencies.zune_inflate]

diff --git a/compiler/base/Dockerfile b/compiler/base/Dockerfile
@@ -44,7 +44,8 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- \
     -y \
     --profile minimal \
     --default-toolchain "${channel}" \
-    --target wasm32-unknown-unknown
+    --target wasm32-unknown-unknown \
+    --component rustfmt
 
 COPY --chown=playground entrypoint.sh /playground/tools/
 

diff --git a/compiler/base/crate-information.json b/compiler/base/crate-information.json
@@ -576,7 +576,7 @@
   },
   {
     "name": "hyper",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "id": "hyper"
   },
   {
@@ -1561,7 +1561,7 @@
   },
   {
     "name": "zeroize",
-    "version": "1.6.1",
+    "version": "1.7.0",
     "id": "zeroize"
   },
   {

diff --git a/compiler/base/orchestrator/Cargo.lock b/compiler/base/orchestrator/Cargo.lock
diff --git a/compiler/base/orchestrator/Cargo.toml b/compiler/base/orchestrator/Cargo.toml
@@ -22,5 +22,6 @@ tracing = { version = "0.1.37", default-features = false, features = ["attribute
 [dev-dependencies]
 assert_matches = "1.5.0"
 assertables = "7.0.1"
+once_cell = "1.18.0"
 tempdir = "0.3.7"
 tracing-subscriber = "0.3.17"