diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2023-06-19 15:58:12 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2023-06-19 15:58:12 +0200 |
| commit | e11535903549f498cb440555494ae2498e926eca (patch) | |
| tree | 8fe8f88cfd0e04615667fa08d025c83c374091ec /src/ci/github-actions | |
| parent | 18a6d911caba59605eb03db1452848a85d2e5879 (diff) | |
CI: merge `x86_64-msvc-cargo` and `x86_64-msvc-tools` jobs
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index a9e42e4a0a0..c0a51cf6455 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -610,16 +610,10 @@ jobs: SCRIPT: make ci-msvc <<: *job-windows-8c - - name: x86_64-msvc-cargo + - name: x86_64-msvc-ext env: - SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld - <<: *job-windows-8c - - - name: x86_64-msvc-tools - env: - SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json + SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows + RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json DEPLOY_TOOLSTATES_JSON: toolstates-windows.json <<: *job-windows-8c |