Skip to content

Commit

Permalink
Merge branch 'master' into move-rust-benchmarks-to-daily
Browse files Browse the repository at this point in the history
  • Loading branch information
cgundy authored Mar 4, 2025
2 parents dd15591 + d8d7a18 commit 4178580
Show file tree
Hide file tree
Showing 124 changed files with 6,146 additions and 2,847 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 @@ -33,6 +33,7 @@ runs:
if [ -z "${SSH_AUTH_SOCK:-}" ]; then
eval "$(ssh-agent -s)"
ssh-add - <<< '${{ inputs.SSH_PRIVATE_KEY_BACKUP_POD }}'
echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> "$GITHUB_ENV"
fi
rm -rf ~/.ssh
Expand Down
14 changes: 7 additions & 7 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
14 changes: 7 additions & 7 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
8 changes: 6 additions & 2 deletions .github/workflows/update-mainnet-revisions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
token: ${{ steps.app-token.outputs.token }}

- name: Update IC versions file
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: |
set -eEuxo pipefail
Expand All @@ -46,8 +48,8 @@ jobs:
uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.PR_CREATION_BOT_PRIVATE_KEY }}
private-key: ${{ secrets.PR_CREATION_BOT_APP_ID }}
app-id: ${{ vars.PR_CREATION_BOT_APP_ID }}
private-key: ${{ secrets.PR_CREATION_BOT_PRIVATE_KEY }}

- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -61,6 +63,8 @@ jobs:
version: 2.53.0

- name: Update Mainnet canisters file
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: |
set -eEuxo pipefail
Expand Down
Loading

0 comments on commit 4178580

Please sign in to comment.