Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into mwe/wasmtime_bump
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-weigelt committed Mar 4, 2025
2 parents c328882 + 596186c commit f49f365
Show file tree
Hide file tree
Showing 134 changed files with 6,321 additions and 2,879 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ go_deps.bzl @dfinity/idx
/packages/ic-dummy-getrandom-for-wasm/ @dfinity/crypto-team
/packages/ic-ed25519/ @dfinity/crypto-team
/packages/ic-ethereum-types/ @dfinity/cross-chain-team
/packages/ic-hpke/ @dfinity/crypto-team
/packages/ic-metrics-assert/ @dfinity/cross-chain-team
/packages/ic-secp256k1/ @dfinity/crypto-team
/packages/ic-sha3/ @dfinity/crypto-team
Expand Down Expand Up @@ -162,7 +163,6 @@ go_deps.bzl @dfinity/idx
/rs/memory_tracker/ @dfinity/execution
/rs/messaging/ @dfinity/ic-message-routing-owners
/rs/monitoring/ @dfinity/consensus
/rs/monitoring/backtrace/ @dfinity/consensus @dfinity/ic-message-routing-owners
/rs/monitoring/metrics @dfinity/consensus @dfinity/ic-message-routing-owners
/rs/monitoring/pprof/ @dfinity/consensus @dfinity/ic-message-routing-owners
/rs/nervous_system/ @dfinity/nns-team
Expand Down
1 change: 1 addition & 0 deletions .github/actions/bazel-test-all/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ inputs:
required: false
GPG_PASSPHRASE:
required: false
description: "GPG key to encrypt build events. If the key is not set, events won't be uploaded."

runs:
using: "composite"
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows-source/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ jobs:
- <<: *checkout
- name: Set BAZEL_EXTRA_ARGS
shell: bash
id: bazel-extra-args
run: |
set -xeuo pipefail
# Determine which tests to skip and append 'long_test' for pull requests, merge groups or push on dev-gh-*
Expand All @@ -120,21 +121,20 @@ jobs:
# Prepend tags with '-' and join them with commas for Bazel
TEST_TAG_FILTERS=$(IFS=,; echo "${EXCLUDED_TEST_TAGS[*]/#/-}")
# Determine BAZEL_EXTRA_ARGS based on event type or branch name
BAZEL_EXTRA_ARGS="--test_tag_filters=$TEST_TAG_FILTERS"
BAZEL_EXTRA_ARGS=( "--test_tag_filters=$TEST_TAG_FILTERS" )
if [[ "$CI_EVENT_NAME" == 'merge_group' ]]; then
BAZEL_EXTRA_ARGS+=" --test_timeout_filters=short,moderate --flaky_test_attempts=3"
BAZEL_EXTRA_ARGS+=( --test_timeout_filters=short,moderate --flaky_test_attempts=3 )
elif [[ $BRANCH_NAME =~ ^hotfix-.* ]]; then
BAZEL_EXTRA_ARGS+=" --test_timeout_filters=short,moderate"
BAZEL_EXTRA_ARGS+=( --test_timeout_filters=short,moderate )
else
BAZEL_EXTRA_ARGS+=" --keep_going"
BAZEL_EXTRA_ARGS+=( --keep_going )
fi
# Export BAZEL_EXTRA_ARGS to environment
echo "BAZEL_EXTRA_ARGS=$BAZEL_EXTRA_ARGS" >> $GITHUB_ENV
echo "BAZEL_EXTRA_ARGS=${BAZEL_EXTRA_ARGS[@]}" >> $GITHUB_OUTPUT
- name: Run Bazel Test All
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: test --config=ci ${{ env.BAZEL_EXTRA_ARGS }}
BAZEL_COMMAND: test --config=ci ${{ steps.bazel-extra-args.outputs.BAZEL_EXTRA_ARGS }}
BAZEL_TARGETS: //...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down Expand Up @@ -175,7 +175,6 @@ jobs:
test --config=ci --config=macos_ci
--test_tag_filters=test_macos
BAZEL_TARGETS: //rs/... //publish/binaries/...
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- <<: *bazel-bep
- name: Purge Bazel Output
if: always()
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows-source/ci-pr-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ jobs:
run: |
[ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
./ci/scripts/bazel-coverage.sh
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- name: Upload bazel-coverage
uses: actions/upload-artifact@v4
with:
name: bazel-coverage
retention-days: 1
if-no-files-found: ignore
compression-level: 9
path: |
cov_html.zip
12 changes: 9 additions & 3 deletions .github/workflows-source/schedule-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@ jobs:
- name: Run Bazel Test Coverage
shell: bash
run: ./ci/scripts/bazel-coverage.sh
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- name: Upload bazel-coverage
uses: actions/upload-artifact@v4
with:
name: bazel-coverage
retention-days: 1
if-no-files-found: ignore
compression-level: 9
path: |
cov_html.zip
15 changes: 7 additions & 8 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
fetch-depth: ${{ github.event_name == 'pull_request' && 256 || 0 }}
- name: Set BAZEL_EXTRA_ARGS
shell: bash
id: bazel-extra-args
run: |
set -xeuo pipefail
# Determine which tests to skip and append 'long_test' for pull requests, merge groups or push on dev-gh-*
Expand All @@ -78,21 +79,20 @@ jobs:
# Prepend tags with '-' and join them with commas for Bazel
TEST_TAG_FILTERS=$(IFS=,; echo "${EXCLUDED_TEST_TAGS[*]/#/-}")
# Determine BAZEL_EXTRA_ARGS based on event type or branch name
BAZEL_EXTRA_ARGS="--test_tag_filters=$TEST_TAG_FILTERS"
BAZEL_EXTRA_ARGS=( "--test_tag_filters=$TEST_TAG_FILTERS" )
if [[ "$CI_EVENT_NAME" == 'merge_group' ]]; then
BAZEL_EXTRA_ARGS+=" --test_timeout_filters=short,moderate --flaky_test_attempts=3"
BAZEL_EXTRA_ARGS+=( --test_timeout_filters=short,moderate --flaky_test_attempts=3 )
elif [[ $BRANCH_NAME =~ ^hotfix-.* ]]; then
BAZEL_EXTRA_ARGS+=" --test_timeout_filters=short,moderate"
BAZEL_EXTRA_ARGS+=( --test_timeout_filters=short,moderate )
else
BAZEL_EXTRA_ARGS+=" --keep_going"
BAZEL_EXTRA_ARGS+=( --keep_going )
fi
# Export BAZEL_EXTRA_ARGS to environment
echo "BAZEL_EXTRA_ARGS=$BAZEL_EXTRA_ARGS" >> $GITHUB_ENV
echo "BAZEL_EXTRA_ARGS=${BAZEL_EXTRA_ARGS[@]}" >> $GITHUB_OUTPUT
- name: Run Bazel Test All
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: test --config=ci ${{ env.BAZEL_EXTRA_ARGS }}
BAZEL_COMMAND: test --config=ci ${{ steps.bazel-extra-args.outputs.BAZEL_EXTRA_ARGS }}
BAZEL_TARGETS: //...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down Expand Up @@ -144,7 +144,6 @@ jobs:
BAZEL_COMMAND: >-
test --config=ci --config=macos_ci --test_tag_filters=test_macos
BAZEL_TARGETS: //rs/... //publish/binaries/...
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- name: Upload bazel-bep
# runs only if previous step succeeded or failed;
# we avoid collecting artifacts of jobs that were cancelled
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/ci-pr-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@ jobs:
run: |
[ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME"
./ci/scripts/bazel-coverage.sh
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- name: Upload bazel-coverage
uses: actions/upload-artifact@v4
with:
name: bazel-coverage
retention-days: 1
if-no-files-found: ignore
compression-level: 9
path: |
cov_html.zip
12 changes: 9 additions & 3 deletions .github/workflows/schedule-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,12 @@ jobs:
- name: Run Bazel Test Coverage
shell: bash
run: ./ci/scripts/bazel-coverage.sh
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- name: Upload bazel-coverage
uses: actions/upload-artifact@v4
with:
name: bazel-coverage
retention-days: 1
if-no-files-found: ignore
compression-level: 9
path: |
cov_html.zip
Loading

0 comments on commit f49f365

Please sign in to comment.