change log location

Author: MikailBag

.github/workflows/rust.yml

@@ -100,7 +100,33 @@ jobs:
         with:
           path: /tmp/logs
           name: tests-trace-${{ matrix.cgroups }}-${{ matrix.os }}
-
+  tests-windows-build:
+    runs-on: 'windows-2019'
+    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-pc-windows-gnu
+          rustup target add x86_64-pc-windows-msvc
+      - uses: actions/cache@v2
+        with:
+          path: ./target
+          key: ${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
+      - name: Build tests (musl)
+        run: |
+          powershell ci/windows-builds.ps1
+        timeout-minutes: 5
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./tests
+          name: tests-windows
+          retention-days: 2
+  
   tests-windows:
     strategy:
       matrix:
@@ -110,10 +136,10 @@ jobs:
     runs-on: windows-latest
     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-windows
       - name: Test
         run: powershell ci/windows.ps1
         timeout-minutes: 5
@@ -123,13 +149,13 @@ jobs:
         if: always()
         run: |
           ls
-          mkdir D:/ci-logs
-          cp ./strace* D:/ci-logs
-          ls D:/ci-logs
+          mkdir ./ci-logs
+          cp ./strace* ./ci-logs
+          ls ./ci-logs
       - uses: actions/upload-artifact@v1
         if: always()
         with:
-          path: D:/ci-logs
+          path: ./ci-logs
           name: tests-ntcalls
 
   nightly-checks:

ci/windows-build.ps1

@@ -0,0 +1,24 @@
+$ErrorActionPreference = "Stop"
+
+
+function Build-JJSForTarget {
+    param($TargetName)
+
+    New-Item -ItemType directory -Path ./tests/$TargetName
+    cargo build -p minion-tests -Zunstable-options --out-dir=./tests/$TargetName --target=$TargetName
+
+    if ($LASTEXITCODE -ne 0) {
+        throw "build failure" 
+    }
+}
+
+Write-Output @'
+[build]
+rustflags=["--cfg", "minion_ci"]
+'@ | Out-File -FilePath ./.cargo/config -Encoding 'utf8'
+
+
+
+$env:RUSTC_BOOTSTRAP = 1
+Build-JJSForTarget -TargetName x86_64-pc-windows-gnu
+Build-JJSForTarget -TargetName x86_64-pc-windows-msvc

ci/windows.ps1

@@ -2,24 +2,10 @@ $ErrorActionPreference = "Stop"
 
 Write-Output "::group::Info"
 Write-Output "Target: $env:CI_TARGET"
-Write-Output "::group::Preparing"
-rustup target add $env:CI_TARGET
-Write-Output @'
-[build]
-rustflags=["--cfg", "minion_ci"]
-'@ | Out-File -FilePath ./.cargo/config -Encoding 'utf8'
-
-Write-Output "::group::Compiling tests"
-$env:RUSTC_BOOTSTRAP = 1
-cargo build -p minion-tests -Zunstable-options --out-dir=./out --target=$env:CI_TARGET
-
-if ($LASTEXITCODE -ne 0) {
-    throw "build failure" 
-}
-
 Write-Output "::group::Running tests"
-$env:RUST_BACKTRACE = 1
-./out/minion-tests.exe --trace
+
+$env:RUST_BACKTRACE = full
+./tests/$env:CI_TARGET/minion-tests.exe --trace
 if ($LASTEXITCODE -ne 0) {
     throw "tests failed"
 }