Skip to content

Commit

Permalink
Merge branch 'main' into akaladarshi/remove-short-flag
Browse files Browse the repository at this point in the history
  • Loading branch information
akaladarshi authored Feb 12, 2025
2 parents cd727b0 + dba563d commit 993206c
Show file tree
Hide file tree
Showing 44 changed files with 920 additions and 416 deletions.
8 changes: 5 additions & 3 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
[profile.default]
slow-timeout = { period = "10s", terminate-after = 3 }

# This test downloads bundles from the network, which can take a while.
# It is only run on CI, so we can afford to be more patient.
[[profile.default.overrides]]
filter = 'test(state_migration_actor_bundle_runs)'
filter = 'test(networks::actors_bundle::tests::check_bundles_are_mirrored)'
slow-timeout = { period = "120s", terminate-after = 3 }

# This test downloads bundles from the network, which can take a while.
# It is only run on CI, so we can afford to be more patient.
[[profile.default.overrides]]
filter = 'test(networks::actors_bundle::tests::check_bundles_are_mirrored)'
filter = 'test(state_migration_actor_bundle)'
slow-timeout = { period = "120s", terminate-after = 3 }

# This test downloads bundles from the network, which can take a while.
# It is only run on CI, so we can afford to be more patient.
[[profile.default.overrides]]
filter = 'test(create_manifest_json)'
filter = 'test(state_migration_generate_actors_metadata)'
slow-timeout = { period = "120s", terminate-after = 3 }

# This test downloads RPC test snapshot files from the network, which can take a while.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/butterflynet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
butterflynet-checks:
name: Butterflynet checks
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- name: Checkout Sources
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checkpoints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
checkpoint_issue:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- uses: JasonEtco/create-an-issue@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-latest-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
jobs:
tag-docker-image:
name: Retag image and push to GHCR
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- name: Login to Github Packages
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerfile-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
docker-check:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-auto-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
update-docs:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- name: Run update script
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
jobs:
docs-check:
name: Check
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
defaults:
run:
working-directory: ./docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ permissions:
jobs:
docs-deploy:
name: Deploy to Cloudflare Pages
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
defaults:
run:
working-directory: ./docs
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docs-required-override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# We need this because merge groups dont support path filters
# https://github.com/community/community/discussions/45899
changes-docs:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
outputs:
changesFound: ${{ steps.filter.outputs.changesFound }}
steps:
Expand All @@ -42,7 +42,7 @@ jobs:
- '**.md'
- '.github/workflows/docs-*.yml'
changes-not-docs:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
outputs:
otherChangesFound: ${{ steps.filter.outputs.otherChangesFound }}
steps:
Expand All @@ -60,7 +60,7 @@ jobs:
override_integration_tests:
name: Integration tests status
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
needs:
- changes-docs
- changes-not-docs
Expand All @@ -70,7 +70,7 @@ jobs:

override_unit_tests:
name: tests
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
needs:
- changes-docs
- changes-not-docs
Expand All @@ -80,7 +80,7 @@ jobs:

override_unit_tests_release:
name: tests-release
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
needs:
- changes-docs
- changes-not-docs
Expand All @@ -90,7 +90,7 @@ jobs:

override_docker_build:
name: Build images and push to GHCR
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
needs:
- changes-docs
- changes-not-docs
Expand Down
32 changes: 29 additions & 3 deletions .github/workflows/forest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Integration tests
concurrency:
group: '${{ github.workflow }}-${{ github.ref }}'
cancel-in-progress: '${{ github.ref != ''refs/heads/main'' }}'
'on':
on:
workflow_dispatch:
merge_group:
pull_request:
Expand All @@ -17,8 +17,7 @@ concurrency:
paths-ignore:
- 'docs/**'
- '.github/workflows/docs-*.yml'
schedule:
- cron: 0 0 * * *

env:
CI: 1
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -185,6 +184,32 @@ jobs:
chmod +x ~/.cargo/bin/forest*
- run: ./scripts/tests/calibnet_stateless_mode_check.sh
timeout-minutes: '${{ fromJSON(env.SCRIPT_TIMEOUT_MINUTES) }}'
calibnet-stateless-rpc-check:
needs:
- build-ubuntu
name: Calibnet stateless RPC check
runs-on: ubuntu-24.04
steps:
- run: lscpu
- uses: actions/cache@v4
with:
path: '${{ env.FIL_PROOFS_PARAMETER_CACHE }}'
key: proof-params-keys
- name: Checkout Sources
uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: 'forest-${{ runner.os }}'
path: ~/.cargo/bin
- uses: actions/download-artifact@v4
with:
name: 'forest-${{ runner.os }}'
path: ~/.cargo/bin
- name: Set permissions
run: |
chmod +x ~/.cargo/bin/forest*
- run: ./scripts/tests/calibnet_stateless_rpc_check.sh
timeout-minutes: '${{ fromJSON(env.SCRIPT_TIMEOUT_MINUTES) }}'
state-migrations-check:
needs:
- build-ubuntu
Expand Down Expand Up @@ -558,6 +583,7 @@ jobs:
- forest-cli-check
- calibnet-check
- calibnet-stateless-mode-check
- calibnet-stateless-rpc-check
- state-migrations-check
- calibnet-wallet-check
- calibnet-export-check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
jobs:
link-check:
name: Link Check
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
permissions:
contents: read
issues: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lotus-api-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
update-lotus:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- name: Update dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rpc_test_repeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
x: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
y: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
name: Calibnet RPC checks
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- name: Run api compare tests
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/rust-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ on:
paths:
- '**/*.rs'
- '.github/workflows/rust-lint.yml'
schedule:
- cron: "0 0 * * *"

env:
CI: 1
Expand Down Expand Up @@ -67,7 +65,7 @@ jobs:

dependencies-check:
name: Check cargo files
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scripts-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
env:
SHELLCHECK_OPTS: --external-sources --source-path=SCRIPTDIR
rubocop:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
Expand All @@ -37,7 +37,7 @@ jobs:
rubocop scripts/
python-lint:
if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue/') }}
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -50,7 +50,7 @@ jobs:
black: true
flake8: true
docker-lint:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v4
- name: validate compose file
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@ on:
# run when moved out of draft.
types: [opened, synchronize, reopened, ready_for_review]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs-*.yml'
- "docs/**"
- ".github/workflows/docs-*.yml"
push:
branches:
- main
paths-ignore:
- 'docs/**'
- '.github/workflows/docs-*.yml'
schedule:
- cron: "0 0 * * *"
- "docs/**"
- ".github/workflows/docs-*.yml"

env:
CI: 1
Expand All @@ -36,7 +34,7 @@ env:

jobs:
tests:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
# Run the job only if the PR is not a draft.
# This is done to limit the runner cost.
if: github.event.pull_request.draft == false
Expand All @@ -55,7 +53,7 @@ jobs:
uses: taiki-e/install-action@nextest
- run: make test
tests-release:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-22.04-arm
# Run the job only if the PR is not a draft.
# This is done to limit the runner cost.
if: github.event.pull_request.draft == false
Expand All @@ -76,3 +74,6 @@ jobs:
- name: install nextest
uses: taiki-e/install-action@nextest
- run: make test-release
env:
# To minimize compile times: https://nnethercote.github.io/perf-book/build-configuration.html#minimizing-compile-times
RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=lld"
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@

- [#4769](https://github.com/ChainSafe/forest/issues/4769) Add delegated address support to `forest-wallet new` command.

- [#5147](https://github.com/ChainSafe/forest/issues/5147) Add support for the `--rpc-filter-list` flag to the `forest` daemon. This flag allows users to specify a list of RPC methods to whitelist or blacklist.

- [#4709](https://github.com/ChainSafe/forest/issues/4709) Add support for `Filecoin.EthTraceReplayBlockTransactions` RPC method.

### Changed
Expand Down
Loading

0 comments on commit 993206c

Please sign in to comment.