Skip to content

Commit 05ec22a

Browse files
committed
Merge branch 'master' into eero/misc-followups-2
2 parents 46ae511 + 87600b1 commit 05ec22a

187 files changed

Lines changed: 6537 additions & 2244 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "ghcr.io/dfinity/ic-dev@sha256:877c1e0c4426d9542f6ff88b419be78fd9d7d235d51c2996246d012b9e4a43dc",
2+
"image": "ghcr.io/dfinity/ic-dev@sha256:9d622eb47c59dd4aed1031903831c63edbcc81ebafa3f2c80d8db98c8b771db9",
33
"remoteUser": "ubuntu",
44
"privileged": true,
55
"runArgs": [
@@ -82,4 +82,4 @@
8282
}
8383
}
8484
}
85-
}
85+
}

.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:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
25+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: &dind-large-setup
3434
labels: dind-large
3535
container: &container-setup
36-
image: ghcr.io/dfinity/ic-build@sha256:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
36+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
3737
options: >-
3838
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
3939
timeout-minutes: 90
@@ -188,8 +188,8 @@ jobs:
188188
189189
# creates a list of targets suitable for --target_pattern_file and list
190190
# the targets on the step summary
191-
ci/scripts/targets.py build "${targets_args[@]}" >"${{ runner.temp }}/build-targets"
192-
ci/scripts/targets.py test "${targets_args[@]}" >"${{ runner.temp }}/test-targets"
191+
/usr/bin/time ci/scripts/targets.py build "${targets_args[@]}" >"${{ runner.temp }}/build-targets"
192+
/usr/bin/time ci/scripts/targets.py test "${targets_args[@]}" >"${{ runner.temp }}/test-targets"
193193
194194
- name: Upload target files
195195
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0

.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:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
40+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
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:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
31+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
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:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
15+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
1616
options: >-
1717
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
1818
timeout-minutes: 60

.github/workflows/local-system-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on:
2020
labels: dind-large
2121
container:
22-
image: ghcr.io/dfinity/ic-build@sha256:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
22+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
2323
options: >-
2424
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
2525
timeout-minutes: 600

.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:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
48+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
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:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
35+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
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
@@ -35,7 +35,7 @@ jobs:
3535
group: dm1
3636
labels: dind-large
3737
container: &container-setup
38-
image: ghcr.io/dfinity/ic-build@sha256:d760427d72cf6420c84f7558af39e9eb3d8a0d26a15892fa1500c4f592a478ae
38+
image: ghcr.io/dfinity/ic-build@sha256:78e4ccf43ec2cac7a3812a28ea34bccb74bed8c35af361737af9ce42a73eb48d
3939
options: >-
4040
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/tmp/containers"
4141
timeout-minutes: 180

0 commit comments

Comments
 (0)