Skip to content

Commit db6db57

Browse files
committed
ci: Reuse ci/run.bash for Windows builds
1 parent c022b92 commit db6db57

File tree

1 file changed

+1
-62
lines changed

1 file changed

+1
-62
lines changed

ci/actions-templates/windows-builds-template.yaml

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -105,68 +105,7 @@ jobs:
105105
run: |
106106
rustup target install ${{ matrix.target }}
107107
- name: Run a full build
108-
run: |
109-
cargo build --release --target ${{ matrix.target }} --locked
110-
cargo run --release --target ${{ matrix.target }} --locked -- --dump-testament
111-
# The test sequence relies on the total set of test binaries not changing
112-
# because I have no idea how to script it. TODO: Get someone to script it?
113-
# A script might be nicer, though these in theory could be made to run
114-
# independently, assuming the run above succeeded, allowing us to run
115-
# the full test suite rather than stop on first error, at least in PRs
116-
- name: Run download and bin tests
117-
run: |
118-
cargo test --release --target ${{ matrix.target }} -p download
119-
cargo test --release --target ${{ matrix.target }} --bin rustup-init
120-
if: env.SKIP_TESTS == ''
121-
- name: Run the lib and doc tests
122-
run: |
123-
cargo test --release --target ${{ matrix.target }} --lib --all
124-
cargo test --release --target ${{ matrix.target }} --doc --all
125-
if: env.SKIP_TESTS == ''
126-
- name: Run the cli-exact test
127-
run: |
128-
cargo test --release --target ${{ matrix.target }} --test cli-exact
129-
if: env.SKIP_TESTS == ''
130-
- name: Run the cli-inst-interactive test
131-
run: |
132-
cargo test --release --target ${{ matrix.target }} --test cli-inst-interactive
133-
if: env.SKIP_TESTS == ''
134-
- name: Run the cli-misc test
135-
run: |
136-
cargo test --release --target ${{ matrix.target }} --test cli-misc
137-
if: env.SKIP_TESTS == ''
138-
- name: Run the cli-rustup test
139-
run: |
140-
cargo test --release --target ${{ matrix.target }} --test cli-rustup
141-
if: env.SKIP_TESTS == ''
142-
- name: Run the cli-self-upd test
143-
run: |
144-
cargo test --release --target ${{ matrix.target }} --test cli-self-upd
145-
if: env.SKIP_TESTS == ''
146-
- name: Run the cli-v1 test
147-
run: |
148-
cargo test --release --target ${{ matrix.target }} --test cli-v1
149-
if: env.SKIP_TESTS == ''
150-
- name: Run the cli-v2 test
151-
run: |
152-
cargo test --release --target ${{ matrix.target }} --test cli-v2
153-
if: env.SKIP_TESTS == ''
154-
- name: Run the dist_install test
155-
run: |
156-
cargo test --release --target ${{ matrix.target }} --test dist_install
157-
if: env.SKIP_TESTS == ''
158-
- name: Run the dist_manifest test
159-
run: |
160-
cargo test --release --target ${{ matrix.target }} --test dist_manifest
161-
if: env.SKIP_TESTS == ''
162-
- name: Run the dist test
163-
run: |
164-
cargo test --release --target ${{ matrix.target }} --test dist -- --test-threads 1
165-
if: env.SKIP_TESTS == ''
166-
- name: Run the dist_transactions test
167-
run: |
168-
cargo test --release --target ${{ matrix.target }} --test dist_transactions
169-
if: env.SKIP_TESTS == ''
108+
run: bash ci/run.bash
170109
- name: Acquire the AWS tooling
171110
run: |
172111
pip3 install awscli

0 commit comments

Comments
 (0)