Skip to content

Commit 6a8030e

Browse files
authored
Merge pull request #2525 from Kobzol/remove-ci-py
Remove outdated ci.py reference
2 parents 049583c + c7693b6 commit 6a8030e

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/tests/docker.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ need to install Docker on a Linux, Windows, or macOS system (typically Linux
66
will be much faster than Windows or macOS because the latter use virtual
77
machines to emulate a Linux environment).
88

9-
Jobs running in CI are configured through a set of bash scripts, and it is not always trivial to reproduce their behavior locally. If you want to run a CI job locally in the simplest way possible, you can use a provided helper Python script that tries to replicate what happens on CI as closely as possible:
9+
Jobs running in CI are configured through a set of bash scripts, and it is not always trivial to reproduce their behavior locally. If you want to run a CI job locally in the simplest way possible, you can use a provided helper `citool` that tries to replicate what happens on CI as closely as possible:
1010

1111
```bash
12-
python3 src/ci/github-actions/ci.py run-local <job-name>
12+
cargo run --manifest-path src/ci/citool/Cargo.toml run-local <job-name>
1313
# For example:
14-
python3 src/ci/github-actions/ci.py run-local dist-x86_64-linux-alt
14+
cargo run --manifest-path src/ci/citool/Cargo.toml run-local dist-x86_64-linux-alt
1515
```
1616

1717
If the above script does not work for you, you would like to have more control of the Docker image execution, or you want to understand what exactly happens during Docker job execution, then continue reading below.
@@ -53,15 +53,6 @@ Some additional notes about using the interactive mode:
5353
containers. With the container name, run `docker exec -it <CONTAINER>
5454
/bin/bash` where `<CONTAINER>` is the container name like `4ba195e95cef`.
5555

56-
The approach described above is a relatively low-level interface for running the Docker images
57-
directly. If you want to run a full CI Linux job locally with Docker, in a way that is as close to CI as possible, you can use the following command:
58-
59-
```bash
60-
cargo run --manifest-path src/ci/citool/Cargo.toml run-local <job-name>
61-
# For example:
62-
cargo run --manifest-path src/ci/citool/Cargo.toml run-local dist-x86_64-linux-alt
63-
```
64-
6556
[Docker]: https://www.docker.com/
6657
[`src/ci/docker`]: https://github.com/rust-lang/rust/tree/master/src/ci/docker
6758
[`src/ci/docker/run.sh`]: https://github.com/rust-lang/rust/blob/master/src/ci/docker/run.sh

0 commit comments

Comments
 (0)