Skip to content

Commit 50ff466

Browse files
Merge branch 'master' into take-snapshot-root
2 parents 710aa82 + 54346da commit 50ff466

File tree

194 files changed

+9038
-2536
lines changed

Some content is hidden

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

194 files changed

+9038
-2536
lines changed

.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-build@sha256:f5cb4f3813d09becd303fc14036568eecb7cdf3ffc65098e5a42c15d3ce77cee",
2+
"image": "ghcr.io/dfinity/ic-build@sha256:cb3a6693a10777d16c301d98f5b67e23db405bf962d0eb8cec74082916c17bc7",
33
"remoteUser": "ubuntu",
44
"privileged": true,
55
"runArgs": [

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ go.sum @dfinity/idx
245245
/rs/tests/ @dfinity/idx
246246
/rs/tests/idx/ @dfinity/idx
247247
/rs/tests/testnets/ @dfinity/idx
248+
/rs/tests/testnets/mainnet_nns/ @dfinity/consensus
249+
/rs/tests/testnets/mainnet_nns.rs @dfinity/consensus
248250
/rs/tests/testnets/nns_recovery.rs @dfinity/consensus
249251
/rs/tests/driver/src/driver/simulate_network.rs @dfinity/consensus @dfinity/idx
250252
/rs/tests/boundary_nodes/ @dfinity/node

.github/actions/bazel/bin/bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ if [[ $bazel_command == "build" ]] || [[ $bazel_command == "test" ]]; then
7171
# cache instance
7272
--remote_max_connections=50
7373

74+
# increase timeout to handle slow connections in CI (default is 60s)
75+
--remote_timeout=90s
76+
7477
--color=yes # Nice CI output
7578

7679
# Write build events to the dedicated tempdir

.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:f5cb4f3813d09becd303fc14036568eecb7cdf3ffc65098e5a42c15d3ce77cee
29+
image: ghcr.io/dfinity/ic-build@sha256:cb3a6693a10777d16c301d98f5b67e23db405bf962d0eb8cec74082916c17bc7
3030
options: >-
3131
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
3232
timeout-minutes: 90

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: &dind-small-setup
3333
labels: dind-small
3434
container: &container-setup
35-
image: ghcr.io/dfinity/ic-build@sha256:f5cb4f3813d09becd303fc14036568eecb7cdf3ffc65098e5a42c15d3ce77cee
35+
image: ghcr.io/dfinity/ic-build@sha256:cb3a6693a10777d16c301d98f5b67e23db405bf962d0eb8cec74082916c17bc7
3636
options: >-
3737
-e NODE_NAME --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
3838
steps:
@@ -201,7 +201,7 @@ jobs:
201201
pull-requests: write
202202
env:
203203
SHELL_WRAPPER: "/usr/bin/time"
204-
CARGO_AUDIT_VERSION: "0.21.0"
204+
CARGO_AUDIT_VERSION: "0.22.0"
205205
CI_MERGE_REQUEST_IID: ${{ inputs.pr-number }}
206206
CI_PROJECT_PATH: ${{ github.repository }}
207207
CI_PIPELINE_ID: ${{ github.run_id }}

.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:f5cb4f3813d09becd303fc14036568eecb7cdf3ffc65098e5a42c15d3ce77cee
48+
image: ghcr.io/dfinity/ic-build@sha256:cb3a6693a10777d16c301d98f5b67e23db405bf962d0eb8cec74082916c17bc7
4949
options: >-
5050
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/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:f5cb4f3813d09becd303fc14036568eecb7cdf3ffc65098e5a42c15d3ce77cee
35+
image: ghcr.io/dfinity/ic-build@sha256:cb3a6693a10777d16c301d98f5b67e23db405bf962d0eb8cec74082916c17bc7
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="/home/buildifier/.local/share/containers"
3838

.github/workflows/release-testing.yml

Lines changed: 5 additions & 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:f5cb4f3813d09becd303fc14036568eecb7cdf3ffc65098e5a42c15d3ce77cee
35+
image: ghcr.io/dfinity/ic-build@sha256:cb3a6693a10777d16c301d98f5b67e23db405bf962d0eb8cec74082916c17bc7
3636
options: >-
3737
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
3838
timeout-minutes: 180
@@ -109,6 +109,10 @@ jobs:
109109
with:
110110
ref: ${{ github.event.workflow_run.head_branch }}
111111
sparse-checkout: "ci/scripts/determine-initial-guest-os-versions.py"
112+
- name: Set up Python
113+
uses: actions/setup-python@v5
114+
with:
115+
python-version: "3.12"
112116
- id: generate
113117
name: Fetch beginning versions for qualification
114118
shell: bash

.github/workflows/rosetta-release.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:f5cb4f3813d09becd303fc14036568eecb7cdf3ffc65098e5a42c15d3ce77cee
25+
image: ghcr.io/dfinity/ic-build@sha256:cb3a6693a10777d16c301d98f5b67e23db405bf962d0eb8cec74082916c17bc7
2626
options: >-
2727
-e NODE_NAME --privileged --cgroupns host --mount type=tmpfs,target="/home/buildifier/.local/share/containers"
2828
environment: DockerHub

.github/workflows/salt-sharing-canister-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:f5cb4f3813d09becd303fc14036568eecb7cdf3ffc65098e5a42c15d3ce77cee
35+
image: ghcr.io/dfinity/ic-build@sha256:cb3a6693a10777d16c301d98f5b67e23db405bf962d0eb8cec74082916c17bc7
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="/home/buildifier/.local/share/containers"
3838

0 commit comments

Comments
 (0)