Skip to content

Commit 6187c85

Browse files
Remove crates.io CI (#6643)
We now have a semver CI, and we branch tutorials to the website on releases, so we don't really need to test against crates.io anymore.
1 parent f957032 commit 6187c85

File tree

4 files changed

+10
-57
lines changed

4 files changed

+10
-57
lines changed

.github/workflows/build-test.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,9 @@ jobs:
170170
run: cargo make ci-job-test-gigo
171171

172172

173-
# ci-job-test-tutorials
174-
test-tutorials:
173+
# ci-job-test-cargo
174+
test-cargo:
175175
runs-on: ubuntu-latest
176-
strategy:
177-
matrix:
178-
behavior: [local, cratesio]
179-
fail-fast: false
180176
steps:
181177
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
182178

@@ -197,8 +193,8 @@ jobs:
197193
run: sudo apt install libharfbuzz-dev
198194

199195
# Actual job
200-
- name: Run `cargo make ci-job-test-tutorials-${{ matrix.behavior }}`
201-
run: cargo make ci-job-test-tutorials-${{ matrix.behavior }}
196+
- name: Run `cargo make ci-job-test-cargo`
197+
run: cargo make ci-job-test-cargo
202198

203199

204200
# ci-job-testdata

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Our wider testsuite is organized as `ci-job-foo` make tasks corresponding to eac
147147

148148
- `ci-job-doc`: Builds all Rustdoc; any warning is treated as an error.
149149
- `ci-job-test-docs`: Runs `cargo test --doc` on all the crates. This takes a while but is the main way of ensuring that nothing has been broken.
150-
- `ci-job-test-tutorials`: Builds all our tutorials against both local code (`locale`), and released ICU4X (`cratesio`).
150+
- `ci-job-test-cargo`: Tests all our Cargo examples.
151151
<br/>
152152

153153
- `ci-job-testdata`: Runs an `icu_provider_source` integration test with a subset of CLDR, ICU, and LSTM source data.

Makefile.toml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,11 @@ dependencies = [
9797
"test-dev-without-assertions",
9898
]
9999

100-
[tasks.ci-job-test-tutorials-local]
101-
description = "Run all checks for the CI 'test-tutorials' job"
100+
[tasks.ci-job-test-cargo]
101+
description = "Run all checks for the CI 'test-cargo' job"
102102
category = "CI"
103103
dependencies = [
104-
"test-tutorials-local",
105-
]
106-
107-
[tasks.ci-job-test-tutorials-cratesio]
108-
description = "Run all checks for the CI 'test-tutorials' job"
109-
category = "CI"
110-
dependencies = [
111-
"test-tutorials-cratesio",
104+
"test-cargo",
112105
]
113106

114107
[tasks.ci-job-testdata]
@@ -278,7 +271,7 @@ dependencies = [
278271
# Get a coffee
279272
"ci-job-test",
280273
"ci-job-test-docs",
281-
"ci-job-test-tutorials-cratesio",
274+
"ci-job-test-cargo",
282275
"ci-job-testdata",
283276
"ci-job-msrv-features",
284277
"ci-job-full-datagen",

tools/make/tests.toml

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ exec --fail-on-error cargo check --manifest-path sync/Cargo.toml
7272
# custom_compiled doesn't compile without data
7373
'''
7474

75-
[tasks.test-tutorials-local]
75+
[tasks.test-cargo]
7676
description = "Build and run the Cargo tutorial projects based on local crates"
7777
category = "ICU4X Development"
7878
script_runner = "@duckscript"
@@ -107,42 +107,6 @@ set_env ICU4X_DATA_DIR ${project_dir}/examples/cargo/custom_compiled/baked_data
107107
exec --fail-on-error cargo run --manifest-path custom_compiled/Cargo.toml
108108
'''
109109

110-
[tasks.test-tutorials-cratesio]
111-
description = "Build and run the Cargo tutorial projects based on crates.io"
112-
category = "ICU4X Development"
113-
script_runner = "@duckscript"
114-
script = '''
115-
exit_on_error true
116-
117-
cd examples/cargo
118-
119-
# Delete the lockfile to make a clean crates.io build
120-
rm -f Cargo.lock
121-
# Delete the patch file to use crates.io
122-
rm -f ../.cargo/config.toml
123-
124-
pwd = pwd
125-
set_env CARGO_TARGET_DIR ${pwd}/target/cratesio
126-
127-
exec --fail-on-error cargo run --release --manifest-path default/Cargo.toml
128-
exec --fail-on-error cargo run --release --manifest-path experimental/Cargo.toml
129-
exec --fail-on-error cargo run --release --manifest-path sync/Cargo.toml
130-
exec --fail-on-error cargo run --release --manifest-path baked/Cargo.toml
131-
exec --fail-on-error cargo run --release --manifest-path harfbuzz/Cargo.toml
132-
133-
# Build the postcard file
134-
# Use the full Makefile task
135-
exec --fail-on-error cargo build --release --manifest-path buffer/Cargo.toml
136-
exec --fail-on-error make -C buffer
137-
exec --fail-on-error cargo run --release --manifest-path buffer/Cargo.toml
138-
139-
# Build custom compiled data
140-
# Use the full Makefile task
141-
exec --fail-on-error make -C custom_compiled
142-
set_env ICU4X_DATA_DIR ${pwd}/custom_compiled/baked_data
143-
exec --fail-on-error cargo run --release --manifest-path custom_compiled/Cargo.toml
144-
'''
145-
146110
[tasks.install-cortex-7]
147111
description = "Install the thumbv7m target"
148112
category = "ICU4X Development"

0 commit comments

Comments
 (0)