Merge pull request #47 from jjs-dev/separate-test-build

Build tests in the separate job

Author: MikailBag

.github/workflows/rust.yml

@@ -2,7 +2,7 @@ name: Rust
 
 on:
   push:
-    branches: 
+    branches:
       - master
       - staging
       - trying
@@ -20,7 +20,7 @@ jobs:
           toolchain: stable
           components: rustfmt
       - name: Check formatting
-        run: | 
+        run: |
           rm -rf .cargo
           cargo fmt --all -- --check
   clippy:
@@ -35,26 +35,51 @@ jobs:
       - name: Run clippy
         run: |
           cargo clippy --workspace -- -Dclippy::all -Dwarnings
-  tests-linux:
+  tests-linux-build:
+    runs-on: 'ubuntu-20.04'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1.0.6
+        with:
+          # nightly is used for cargo --out-dir option.
+          toolchain: nightly
+          override: true
+      - name: Install targets
+        run: |
+          rustup target add x86_64-unknown-linux-musl
+      - name: Build tests (musl)
+        run: |
+          mkdir -p ./tests/x86_64-unknown-linux-musl
+          cargo build -p minion-tests -Zunstable-options --out-dir=./tests/x86_64-unknown-linux-musl --target=x86_64-unknown-linux-musl
+        timeout-minutes: 5
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./tests
+          name: tests-linux
+          retention-days: 2
+  tests-linux-run:
     strategy:
       matrix:
-        os: 
-          - 'ubuntu-20.04'
-          - 'macos-latest'
+        os:
+          - "ubuntu-20.04"
+          - "macos-latest"
         rust-target:
-          - 'x86_64-unknown-linux-musl'
+          - "x86_64-unknown-linux-musl"
         cgroups:
-          - 'cgroup-v1'
-          - 'cgroup-v2'
+          - "cgroup-v1"
+          - "cgroup-v2"
     runs-on: ${{ matrix.os }}
+    needs:
+      - tests-linux-build
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1.0.6
-        with: 
-          toolchain: stable
-          override: true
+      - uses: actions/download-artifact@v1
+        with:
+          path: ./tests
+          name: tests-linux
       - name: Test
-        run: bash ci/linux.sh
+        run: |
+          bash ci/linux.sh
         timeout-minutes: 10
         env:
           CI_TARGET: ${{ matrix.rust-target }}
@@ -85,4 +110,3 @@ jobs:
           cargo check --workspace
         env:
           RUSTFLAGS: -Wunused-crate-dependencies --cfg minion_nightly
-      

ci/linux.sh

@@ -29,17 +29,15 @@ Vagrant.configure("2") do |config|
   config.vm.box = "fedora/32-cloud-base"
 
   config.vm.provider "virtualbox" do |vb|
-    vb.memory = "900"
+    vb.memory = "700"
   end
 end
 EOF
   top -l 1
   cat Vagrantfile
   sudo vagrant up
   echo "::group::Installing packages"
-  sudo vagrant ssh --command "sudo dnf install -y gcc gcc-c++ strace zip"
-  echo "::group::Installing rust"
-  sudo vagrant ssh --command "curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain stable"
+  sudo vagrant ssh --command "sudo dnf install -y strace zip"
   echo "::group::Entering VM"
   sudo vagrant ssh --command "bash -c 'cd /vagrant && CI_OS=$CI_OS CI_CGROUPS=$CI_CGROUPS CI_TARGET=$CI_TARGET CI_VM=1 bash ci/linux.sh'" 
   echo "Host: pulling logs from VM"
@@ -52,24 +50,16 @@ EOF
   exit 0
 fi
 
-rustup target add $CI_TARGET  
-
 if [[ $CI_CGROUPS == "cgroup-v2" ]]; then
   echo "::group::Some cgroup hacks"
   sudo mkdir /sys/fs/cgroup/minion
   echo "+cpu +memory +pids" | sudo tee /sys/fs/cgroup/cgroup.subtree_control
   echo "+cpu +memory +pids" | sudo tee /sys/fs/cgroup/minion/cgroup.subtree_control
 fi
 
-echo "::group::Compiling tests"
-echo '[build]
-rustflags=["--cfg", "minion_ci"]' > .cargo/config
-
-export RUSTC_BOOTSTRAP=1
-cargo build -p minion-tests -Zunstable-options --out-dir=./out --target=$CI_TARGET
-
 echo "::group::Running tests"
-sudo --preserve-env ./out/minion-tests --trace
+chmod +x ./tests/$CI_TARGET/minion-tests
+sudo --preserve-env ./tests/$CI_TARGET/minion-tests --trace
 echo "::group::Finalize"
 echo "Current directory after running tests"
 ls .