Skip to content

Commit

Permalink
Merge branch 'master' into maciej-clear-heap
Browse files Browse the repository at this point in the history
  • Loading branch information
maciejdfinity authored Jan 21, 2025
2 parents 074f7b9 + 83c1bbf commit 9c11cb8
Show file tree
Hide file tree
Showing 186 changed files with 1,120 additions and 1,153 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45",
"image": "ghcr.io/dfinity/ic-build@sha256:2e8185171700872d48fdfb4b08e175fca5be27b3fbbc4d7bed681ec8486f8b1d",
"remoteUser": "ubuntu",
"privileged": true,
"runArgs": [
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows-source/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
image: ghcr.io/dfinity/ic-build@sha256:2e8185171700872d48fdfb4b08e175fca5be27b3fbbc4d7bed681ec8486f8b1d
dind-large-setup: &dind-large-setup
runs-on:
labels: dind-large
Expand All @@ -49,13 +49,12 @@ anchors:
container:
<<: *image
timeout-minutes: 30
docker-login: &docker-login
name: Login to Dockerhub
before-script: &before-script
name: Before script
id: before-script
shell: bash
run: ./ci/scripts/docker-login.sh
env:
DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
run: |
[ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
checkout: &checkout
name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -105,7 +104,7 @@ jobs:
RUN_ON_DIFF_ONLY: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }}
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Set BAZEL_EXTRA_ARGS
shell: bash
run: |
Expand Down Expand Up @@ -163,7 +162,7 @@ jobs:
if: ${{ contains(github.event.pull_request.labels.*.name, 'CI_BUILD_CHECK') }}
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run bazel build --config=check //rs/...
id: bazel-build-config-check
uses: ./.github/actions/bazel-test-all/
Expand All @@ -190,7 +189,8 @@ jobs:
run: |
echo "/usr/local/bin" >> $GITHUB_PATH
echo "$HOME/.cargo/bin:" >> $GITHUB_PATH
- <<: *docker-login
# use llvm-clang instead of apple's
echo "CC=/usr/local/opt/llvm/bin/clang" >> "$GITHUB_ENV"
- name: Run Bazel Test Darwin x86-64
id: bazel-test-darwin-x86-64
uses: ./.github/actions/bazel-test-all/
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
if: ${{ github.event_name != 'merge_group' }}
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run Build IC
id: build-ic
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows-source/ci-pr-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
image: ghcr.io/dfinity/ic-build@sha256:2e8185171700872d48fdfb4b08e175fca5be27b3fbbc4d7bed681ec8486f8b1d
dind-small-setup: &dind-small-setup
timeout-minutes: 30
runs-on:
Expand Down
23 changes: 11 additions & 12 deletions .github/workflows-source/release-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
image: ghcr.io/dfinity/ic-build@sha256:2e8185171700872d48fdfb4b08e175fca5be27b3fbbc4d7bed681ec8486f8b1d
dind-large-setup: &dind-large-setup
runs-on:
group: zh1
Expand All @@ -40,13 +40,12 @@ anchors:
uses: actions/checkout@v4
with:
ref: ${{ github.event.workflow_run.head_branch }}
docker-login: &docker-login
name: Login to Dockerhub
before-script: &before-script
name: Before script
id: before-script
shell: bash
run: ./ci/scripts/docker-login.sh
env:
DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
run: |
[ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
bazel-bep: &bazel-bep
name: Upload bazel-bep
# runs only if previous step succeeded or failed;
Expand All @@ -73,7 +72,7 @@ jobs:
<<: *dind-large-setup
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run Bazel System Test Nightly
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
Expand All @@ -90,7 +89,7 @@ jobs:
<<: *dind-large-setup
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run Bazel System Test Staging
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
Expand All @@ -108,7 +107,7 @@ jobs:
timeout-minutes: 90
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run Bazel Test All
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
Expand All @@ -135,7 +134,7 @@ jobs:
REPO_NAME: ${{ github.repository }}
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Set up Python
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -182,7 +181,7 @@ jobs:
<<: *dind-large-setup
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run qualification for version ${{ matrix.version }} from the tip of the branch
uses: ./.github/actions/bazel-test-all/
with:
Expand Down
21 changes: 10 additions & 11 deletions .github/workflows-source/schedule-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
image: ghcr.io/dfinity/ic-build@sha256:2e8185171700872d48fdfb4b08e175fca5be27b3fbbc4d7bed681ec8486f8b1d
dind-large-setup: &dind-large-setup
runs-on:
group: zh1
Expand All @@ -31,13 +31,12 @@ anchors:
checkout: &checkout
name: Checkout
uses: actions/checkout@v4
docker-login: &docker-login
name: Login to Dockerhub
before-script: &before-script
name: Before script
id: before-script
shell: bash
run: ./ci/scripts/docker-login.sh
env:
DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
run: |
[ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
bazel-bep: &bazel-bep
name: Upload bazel-bep
# runs only if previous step succeeded or failed;
Expand All @@ -64,7 +63,7 @@ jobs:
labels: dind-large
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run Bazel Launch Bare Metal
shell: bash
run: |
Expand Down Expand Up @@ -108,7 +107,7 @@ jobs:
timeout-minutes: 720 # 12 hours
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run FI Tests Nightly
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
Expand All @@ -127,7 +126,7 @@ jobs:
timeout-minutes: 20
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run NNS Tests Nightly
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
Expand All @@ -146,7 +145,7 @@ jobs:
timeout-minutes: 480
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Set Benchmark Targets
shell: bash
run: |
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows-source/schedule-hourly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

anchors:
image: &image
image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
image: ghcr.io/dfinity/ic-build@sha256:2e8185171700872d48fdfb4b08e175fca5be27b3fbbc4d7bed681ec8486f8b1d
dind-large-setup: &dind-large-setup
runs-on:
labels: dind-large
Expand All @@ -30,13 +30,12 @@ anchors:
checkout: &checkout
name: Checkout
uses: actions/checkout@v4
docker-login: &docker-login
name: Login to Dockerhub
before-script: &before-script
name: Before script
id: before-script
shell: bash
run: ./ci/scripts/docker-login.sh
env:
DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }}
DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }}
run: |
[ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
bazel-bep: &bazel-bep
name: Upload bazel-bep
# runs only if previous step succeeded or failed;
Expand All @@ -58,7 +57,7 @@ jobs:
<<: *dind-large-setup
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run Bazel Build All No Cache
uses: ./.github/actions/bazel-test-all/
env:
Expand All @@ -77,7 +76,7 @@ jobs:
labels: dind-large
steps:
- <<: *checkout
- <<: *docker-login
- <<: *before-script
- name: Run Bazel System Test Hourly
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/anonymization-backend-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
labels: dind-large

container:
image: ghcr.io/dfinity/ic-build@sha256:4fd13b47285e783c3a6f35aadd9559d097c0de162a1cf221ead66ab1598d5d45
image: ghcr.io/dfinity/ic-build@sha256:2e8185171700872d48fdfb4b08e175fca5be27b3fbbc4d7bed681ec8486f8b1d
options: >-
-e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info
Expand Down
Loading

0 comments on commit 9c11cb8

Please sign in to comment.