diff options
| author | xoviat <[email protected]> | 2025-12-11 09:08:50 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-12-11 09:08:50 -0600 |
| commit | 1aadce76847a7686bf66e3a6532e18e05042f78a (patch) | |
| tree | ca42d80e784a6746065bd4e0c676db3ef0f10b93 /.github/ci | |
| parent | 52a9b08f0ca13d23bfb039c884a9101997c10567 (diff) | |
| parent | f650afc33b2d6b39116f27c6545c5f2d9e3c7d06 (diff) | |
Merge branch 'main' into main
Diffstat (limited to '.github/ci')
| -rwxr-xr-x | .github/ci/book.sh | 2 | ||||
| -rwxr-xr-x | .github/ci/build-nightly.sh | 2 | ||||
| -rwxr-xr-x | .github/ci/build-xtensa.sh | 2 | ||||
| -rwxr-xr-x | .github/ci/build.sh | 2 | ||||
| -rwxr-xr-x | .github/ci/doc.sh | 4 | ||||
| -rwxr-xr-x | .github/ci/janitor.sh | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/.github/ci/book.sh b/.github/ci/book.sh index 6c300bf09..a39f0dac7 100755 --- a/.github/ci/book.sh +++ b/.github/ci/book.sh | |||
| @@ -9,7 +9,7 @@ set -euxo pipefail | |||
| 9 | make -C docs | 9 | make -C docs |
| 10 | 10 | ||
| 11 | export KUBECONFIG=/ci/secrets/kubeconfig.yml | 11 | export KUBECONFIG=/ci/secrets/kubeconfig.yml |
| 12 | POD=$(kubectl -n embassy get po -l app=website -o jsonpath={.items[0].metadata.name}) | 12 | POD=$(kubectl get po -l app=website -o jsonpath={.items[0].metadata.name}) |
| 13 | 13 | ||
| 14 | mkdir -p build | 14 | mkdir -p build |
| 15 | mv docs/book build/book | 15 | mv docs/book build/book |
diff --git a/.github/ci/build-nightly.sh b/.github/ci/build-nightly.sh index 82e9436f3..04fbd2353 100755 --- a/.github/ci/build-nightly.sh +++ b/.github/ci/build-nightly.sh | |||
| @@ -23,7 +23,7 @@ fi | |||
| 23 | hashtime restore /ci/cache/filetime.json || true | 23 | hashtime restore /ci/cache/filetime.json || true |
| 24 | hashtime save /ci/cache/filetime.json | 24 | hashtime save /ci/cache/filetime.json |
| 25 | 25 | ||
| 26 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev d015fd5e972a3e550ebef0da6748099b88a93ba6 | 26 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev c60400e213f7eb0296581183140ec147dd7a848b |
| 27 | 27 | ||
| 28 | ./ci-nightly.sh | 28 | ./ci-nightly.sh |
| 29 | 29 | ||
diff --git a/.github/ci/build-xtensa.sh b/.github/ci/build-xtensa.sh index 3f74b4a5a..f07816861 100755 --- a/.github/ci/build-xtensa.sh +++ b/.github/ci/build-xtensa.sh | |||
| @@ -25,7 +25,7 @@ fi | |||
| 25 | hashtime restore /ci/cache/filetime.json || true | 25 | hashtime restore /ci/cache/filetime.json || true |
| 26 | hashtime save /ci/cache/filetime.json | 26 | hashtime save /ci/cache/filetime.json |
| 27 | 27 | ||
| 28 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev d015fd5e972a3e550ebef0da6748099b88a93ba6 | 28 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev c60400e213f7eb0296581183140ec147dd7a848b |
| 29 | 29 | ||
| 30 | ./ci-xtensa.sh | 30 | ./ci-xtensa.sh |
| 31 | 31 | ||
diff --git a/.github/ci/build.sh b/.github/ci/build.sh index 3c196f72b..cd3006c49 100755 --- a/.github/ci/build.sh +++ b/.github/ci/build.sh | |||
| @@ -28,7 +28,7 @@ fi | |||
| 28 | hashtime restore /ci/cache/filetime.json || true | 28 | hashtime restore /ci/cache/filetime.json || true |
| 29 | hashtime save /ci/cache/filetime.json | 29 | hashtime save /ci/cache/filetime.json |
| 30 | 30 | ||
| 31 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev d015fd5e972a3e550ebef0da6748099b88a93ba6 | 31 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev c60400e213f7eb0296581183140ec147dd7a848b |
| 32 | 32 | ||
| 33 | ./ci.sh | 33 | ./ci.sh |
| 34 | 34 | ||
diff --git a/.github/ci/doc.sh b/.github/ci/doc.sh index 535fc5262..85eed9f80 100755 --- a/.github/ci/doc.sh +++ b/.github/ci/doc.sh | |||
| @@ -12,11 +12,11 @@ export CARGO_TARGET_DIR=/ci/cache/target | |||
| 12 | export PATH=$CARGO_HOME/bin:$PATH | 12 | export PATH=$CARGO_HOME/bin:$PATH |
| 13 | mv rust-toolchain-nightly.toml rust-toolchain.toml | 13 | mv rust-toolchain-nightly.toml rust-toolchain.toml |
| 14 | 14 | ||
| 15 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev d015fd5e972a3e550ebef0da6748099b88a93ba6 | 15 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev c60400e213f7eb0296581183140ec147dd7a848b |
| 16 | 16 | ||
| 17 | cargo embassy-devtool doc -o webroot | 17 | cargo embassy-devtool doc -o webroot |
| 18 | 18 | ||
| 19 | export KUBECONFIG=/ci/secrets/kubeconfig.yml | 19 | export KUBECONFIG=/ci/secrets/kubeconfig.yml |
| 20 | POD=$(kubectl -n embassy get po -l app=docserver -o jsonpath={.items[0].metadata.name}) | 20 | POD=$(kubectl get po -l app=docserver -o jsonpath={.items[0].metadata.name}) |
| 21 | kubectl cp webroot/crates $POD:/data | 21 | kubectl cp webroot/crates $POD:/data |
| 22 | kubectl cp webroot/static $POD:/data | 22 | kubectl cp webroot/static $POD:/data |
diff --git a/.github/ci/janitor.sh b/.github/ci/janitor.sh index bc43075bd..9679308f2 100755 --- a/.github/ci/janitor.sh +++ b/.github/ci/janitor.sh | |||
| @@ -9,7 +9,7 @@ export CARGO_HOME=/ci/cache/cargo | |||
| 9 | export CARGO_TARGET_DIR=/ci/cache/target | 9 | export CARGO_TARGET_DIR=/ci/cache/target |
| 10 | export PATH=$CARGO_HOME/bin:$PATH | 10 | export PATH=$CARGO_HOME/bin:$PATH |
| 11 | 11 | ||
| 12 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev d015fd5e972a3e550ebef0da6748099b88a93ba6 | 12 | cargo install --git https://github.com/embassy-rs/cargo-embassy-devtool --locked --rev c60400e213f7eb0296581183140ec147dd7a848b |
| 13 | 13 | ||
| 14 | cargo embassy-devtool check-crlf | 14 | cargo embassy-devtool check-crlf |
| 15 | cargo embassy-devtool check-manifest | 15 | cargo embassy-devtool check-manifest |
