Skip to content

Commit f2eb13a

Browse files
kinnisonkinnison
authored
Merge pull request #2303 from lzutao/run.bash
ci: Reuse ci/run.bash for Windows builds
2 parents 08444eb + 7f14e63 commit f2eb13a

File tree

4 files changed

+4
-248
lines changed

4 files changed

+4
-248
lines changed

‎.github/workflows/windows-builds-on-master.yaml

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

‎.github/workflows/windows-builds-on-pr.yaml

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

‎.github/workflows/windows-builds-on-stable.yaml

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

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

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

0 commit comments

Comments
 (0)