Skip to content

Commit 9304251

Browse files
authored
Merge branch 'master' into eichhorl/ingress-test
2 parents 807ee63 + 190e896 commit 9304251

35 files changed

+557
-351
lines changed

.claude/CLAUDE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ After changing Rust code (`*.rs`) follow these steps in order:
88

99
1. **Format** by running the following from the root of the repository:
1010
```
11+
cd "$(git rev-parse --show-toplevel)"
1112
rustfmt <MODIFIED_RUST_FILES>
1213
```
1314
where `<MODIFIED_RUST_FILES>` is a space separated list of paths of all modified Rust files relative to the root of the repository.
1415
2. **Lint** by running the following from the root of the repository:
1516
```
17+
cd "$(git rev-parse --show-toplevel)"
1618
cargo clippy --all-features <CRATES> -- \
1719
-D warnings \
1820
-D clippy::all \
@@ -30,6 +32,7 @@ After changing Rust code (`*.rs`) follow these steps in order:
3032
Fix any linting errors.
3133
3. **Build** the directly affected bazel targets by running the following from the root of the repository:
3234
```
35+
cd "$(git rev-parse --show-toplevel)"
3336
TARGETS="$(bazel query 'kind(rule, rdeps(//..., set(<MODIFIED_FILES>), 1))' --keep_going 2>/dev/null)"
3437
if [ -n "$TARGETS" ]; then
3538
bazel build $TARGETS
@@ -40,6 +43,7 @@ After changing Rust code (`*.rs`) follow these steps in order:
4043
Fix all build errors.
4144
4. **Test** the directly affected bazel tests by running the following from the root of the repository:
4245
```
46+
cd "$(git rev-parse --show-toplevel)"
4347
TESTS="$(bazel query 'kind(".*_test|test_suite", kind(rule, rdeps(//..., set(<MODIFIED_FILES>), 2)))' --keep_going 2>/dev/null)"
4448
if [ -n "$TESTS" ]; then
4549
bazel test --test_output=errors $TESTS

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "ghcr.io/dfinity/ic-dev@sha256:9eea2de3aa64a5c1dcd9ec2073e9abba27e3fcfaf524616a21c1ac42739c343c",
2+
"image": "ghcr.io/dfinity/ic-dev@sha256:fe06783d9cf8e9fc901a5996d9fc8b726f15769f2fd6bd86969d1fbbf77ae025",
33
"remoteUser": "ubuntu",
44
"privileged": true,
55
"runArgs": [

.github/workflows/api-bn-recovery-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on:
2323
labels: dind-large
2424
container:
25-
image: ghcr.io/dfinity/ic-build@sha256:59e782e6278dd127f8c19344403cc61f73dcb6f446247b22e1c8214cff5ba26a
25+
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
2626
options: >-
2727
-e NODE_NAME --privileged --cgroupns host
2828
--mount type=tmpfs,target="/home/buildifier/.local/share/containers"

.github/workflows/ci-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: &dind-large-setup
2727
labels: dind-large
2828
container: &container-setup
29-
image: ghcr.io/dfinity/ic-build@sha256:59e782e6278dd127f8c19344403cc61f73dcb6f446247b22e1c8214cff5ba26a
29+
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
3030
options: >-
3131
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
3232
timeout-minutes: 90

.github/workflows/ci-pr-only.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: &dind-small-setup
3838
labels: dind-small
3939
container: &container-setup
40-
image: ghcr.io/dfinity/ic-build@sha256:59e782e6278dd127f8c19344403cc61f73dcb6f446247b22e1c8214cff5ba26a
40+
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
4141
options: >-
4242
-e NODE_NAME --mount type=tmpfs,target="/tmp/containers"
4343
steps:

.github/workflows/container-api-bn-recovery.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on:
2929
labels: dind-large
3030
container:
31-
image: ghcr.io/dfinity/ic-build@sha256:59e782e6278dd127f8c19344403cc61f73dcb6f446247b22e1c8214cff5ba26a
31+
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
3232
options: >-
3333
-e NODE_NAME --privileged --cgroupns host
3434
--mount type=tmpfs,target="/home/buildifier/.local/share/containers"

.github/workflows/container-scan-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on:
1313
labels: dind-large
1414
container:
15-
image: ghcr.io/dfinity/ic-build@sha256:59e782e6278dd127f8c19344403cc61f73dcb6f446247b22e1c8214cff5ba26a
15+
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
1616
options: >-
1717
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
1818
timeout-minutes: 60

.github/workflows/pocket-ic-tests-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
bazel-build-pocket-ic:
4646
name: Bazel Build PocketIC
4747
container:
48-
image: ghcr.io/dfinity/ic-build@sha256:59e782e6278dd127f8c19344403cc61f73dcb6f446247b22e1c8214cff5ba26a
48+
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
4949
options: >-
5050
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
5151
timeout-minutes: 90

.github/workflows/rate-limits-backend-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
labels: dind-large
3333

3434
container:
35-
image: ghcr.io/dfinity/ic-build@sha256:59e782e6278dd127f8c19344403cc61f73dcb6f446247b22e1c8214cff5ba26a
35+
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
3636
options: >-
3737
-e NODE_NAME --privileged --cgroupns host -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info --mount type=tmpfs,target="/tmp/containers"
3838

.github/workflows/release-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: &dind-large-setup
3333
labels: dind-large
3434
container: &container-setup
35-
image: ghcr.io/dfinity/ic-build@sha256:59e782e6278dd127f8c19344403cc61f73dcb6f446247b22e1c8214cff5ba26a
35+
image: ghcr.io/dfinity/ic-build@sha256:18d23aef1f5e9e7e1eef94c32563f8ed15531ae79065bb00bb5206a643fc49fe
3636
options: >-
3737
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
3838
timeout-minutes: 180

0 commit comments

Comments
 (0)