Skip to content

Commit 7f14e63

Browse files
tesujitesuji
committed
ci: regen workflows
1 parent db6db57 commit 7f14e63

File tree

3 files changed

+3
-186
lines changed

3 files changed

+3
-186
lines changed

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

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

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

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

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

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

0 commit comments

Comments
 (0)