diff --git a/.github/INTEGRATION_FAILURE.md b/.github/INTEGRATION_FAILURE.md
index afa055b18364e..bda129177f706 100644
--- a/.github/INTEGRATION_FAILURE.md
+++ b/.github/INTEGRATION_FAILURE.md
@@ -3,8 +3,8 @@ title: "bug: long-running integration tests failed"
labels: P-high, T-bug
---
-The heavy (long-running) integration tests have failed. This indicates a regression in foundry.
+The heavy (long-running) integration tests have failed. This indicates a regression in Foundry.
-Check the [heavy integration tests workflow page]({{env.WORKFLOW_URL}}) for details.
+Check the [heavy integration tests workflow page]({{ env.WORKFLOW_URL }}) for details.
-This issue was raised by the workflow at `.github/workflows/heavy-integration.yml`.
\ No newline at end of file
+This issue was raised by the workflow at `.github/workflows/heavy-integration.yml`.
diff --git a/.github/RELEASE_FAILURE_ISSUE_TEMPLATE.md b/.github/RELEASE_FAILURE_ISSUE_TEMPLATE.md
index eb33b48971ef4..2ff598cc1b371 100644
--- a/.github/RELEASE_FAILURE_ISSUE_TEMPLATE.md
+++ b/.github/RELEASE_FAILURE_ISSUE_TEMPLATE.md
@@ -5,6 +5,6 @@ labels: P-high, T-bug
The release workflow has failed. Some or all binaries might have not been published correctly.
-Check the [release workflow page]({{env.WORKFLOW_URL}}) for details.
+Check the [release workflow page]({{ env.WORKFLOW_URL }}) for details.
-This issue was raised by the workflow at `.github/workflows/release.yml`.
\ No newline at end of file
+This issue was raised by the workflow at `.github/workflows/release.yml`.
diff --git a/.github/scripts/matrices.py b/.github/scripts/matrices.py
new file mode 100755
index 0000000000000..7c3e3f4bc896d
--- /dev/null
+++ b/.github/scripts/matrices.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python3
+
+import json
+import os
+
+
+class Target:
+ # GitHub runner OS
+ os_id: str
+ # Rust target triple
+ target: str
+
+ def __init__(self, os_id: str, target: str):
+ self.os_id = os_id
+ self.target = target
+
+
+class Case:
+ name: str
+ filter: str
+ n_partitions: int
+ xplatform: bool
+
+ def __init__(self, name: str, filter: str, n_partitions: int, xplatform: bool):
+ self.name = name
+ self.filter = filter
+ self.n_partitions = n_partitions
+ self.xplatform = xplatform
+
+
+class Expanded:
+ os: str
+ target: str
+ name: str
+ flags: str
+ partition: int
+
+ def __init__(self, os: str, target: str, name: str, flags: str, partition: int):
+ self.os = os
+ self.target = target
+ self.name = name
+ self.flags = flags
+ self.partition = partition
+
+
+default_target = Target("ubuntu-latest", "x86_64-unknown-linux-gnu")
+if os.environ.get("EVENT_NAME") == "pull_request":
+ targets = [default_target]
+else:
+ targets = [
+ default_target,
+ Target("ubuntu-latest", "aarch64-unknown-linux-gnu"),
+ Target("macos-latest", "x86_64-apple-darwin"),
+ Target("macos-latest", "aarch64-apple-darwin"),
+ Target("windows-latest", "x86_64-pc-windows-msvc"),
+ ]
+
+config = [
+ Case(
+ name="unit",
+ filter="kind(lib) | kind(bench) | kind(proc-macro)",
+ n_partitions=1,
+ xplatform=True,
+ ),
+ Case(
+ name="integration",
+ filter="kind(test) & !test(/issue|forge_std|ext_integration/)",
+ n_partitions=3,
+ xplatform=True,
+ ),
+ Case(
+ name="integration/issue-repros",
+ filter="package(=forge) & test(~issue)",
+ n_partitions=2,
+ xplatform=False,
+ ),
+ Case(
+ name="integration/forge-std",
+ filter="package(=forge) & test(~forge_std)",
+ n_partitions=1,
+ xplatform=False,
+ ),
+ Case(
+ name="integration/external",
+ filter="package(=forge) & test(~ext_integration)",
+ n_partitions=2,
+ xplatform=False,
+ ),
+]
+
+
+def build_matrix():
+ expanded = []
+ for target in targets:
+ expanded.append({"os": target.os_id, "target": target.target})
+ print_json({"include": expanded})
+
+
+def test_matrix():
+ expanded = []
+ for target in targets:
+ for case in config:
+ if not case.xplatform and target != default_target:
+ continue
+
+ for partition in range(1, case.n_partitions + 1):
+ os_str = ""
+ if len(targets) > 1:
+ os_str = f" ({target.target})"
+
+ name = case.name
+ flags = f"-E '{case.filter}'"
+ if case.n_partitions > 1:
+ s = f"{partition}/{case.n_partitions}"
+ name += f" ({s})"
+ flags += f" --partition count:{s}"
+ name += os_str
+
+ obj = Expanded(
+ os=target.os_id,
+ target=target.target,
+ name=name,
+ flags=flags,
+ partition=partition,
+ )
+ expanded.append(vars(obj))
+
+ print_json({"include": expanded})
+
+
+def print_json(obj):
+ print(json.dumps(obj), end="", flush=True)
+
+
+if __name__ == "__main__":
+ if int(os.environ.get("TEST", "0")) == 0:
+ build_matrix()
+ else:
+ test_matrix()
diff --git a/.github/workflows/cross-platform.yml b/.github/workflows/cross-platform.yml
deleted file mode 100644
index bd9e19fc21db3..0000000000000
--- a/.github/workflows/cross-platform.yml
+++ /dev/null
@@ -1,206 +0,0 @@
-on:
- workflow_dispatch:
- workflow_call:
-
-name: cross-platform
-
-env:
- CARGO_TERM_COLOR: always
-
-jobs:
- build-tests:
- name: building ${{ matrix.job.target }} (${{ matrix.job.os }}) / ${{ matrix.archive.name }}
- runs-on: ${{ matrix.job.os }}
- timeout-minutes: 60
- strategy:
- fail-fast: false
- matrix:
- archive:
- - name: unit-tests
- file: nextest-unit.tar.zst
- flags: --workspace --all-features --lib --bins
- - name: integration-tests
- file: nextest-integration.tar.zst
- flags: --workspace
- job:
- # The OS is used for the runner
- # The target is used by Cargo
- - os: ubuntu-latest
- target: x86_64-unknown-linux-gnu
- - os: ubuntu-latest
- target: aarch64-unknown-linux-gnu
- - os: macos-latest
- target: x86_64-apple-darwin
- - os: macos-latest
- target: aarch64-apple-darwin
- - os: windows-latest
- target: x86_64-pc-windows-msvc
- wsl: wsl
- - os: windows-latest
- target: x86_64-pc-windows-msvc
-
- steps:
- - uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@stable
- with:
- targets: ${{ matrix.job.target }}
- - uses: Swatinem/rust-cache@v2
- - name: Install nextest
- uses: taiki-e/install-action@nextest
-
- # Required for forge commands that use git
- - name: Setup git
- run: |
- git config --global user.name "GitHub Actions Bot"
- git config --global user.email "<>"
-
- - name: Apple M1 setup
- if: ${{ matrix.job.target == 'aarch64-apple-darwin' }}
- run: |
- echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
- echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
-
- - name: Linux ARM setup
- if: ${{ matrix.job.target == 'aarch64-unknown-linux-gnu' }}
- run: |
- sudo apt-get update -y
- sudo apt-get install -y gcc-aarch64-linux-gnu
- echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-
- # For some reason the FFI cheatcode uses WSL bash instead of Git bash, so we need to install a WSL distribution
- - name: Windows setup
- if: ${{ matrix.job.wsl == 'wsl' }}
- uses: Vampire/setup-wsl@v1
- with:
- distribution: Ubuntu-20.04
- set-as-default: true
-
- - name: Build archive (unit tests)
- run: |
- cargo nextest archive --locked ${{ matrix.job.flags }} --archive-file ${{ matrix.job.target }}-${{ matrix.archive.file }}
- - name: Upload archive
- uses: actions/upload-artifact@v3
- with:
- name: ${{ matrix.job.target }}-${{ matrix.archive.name }}
- path: ${{ matrix.job.target }}-${{ matrix.archive.file }}
-
- unit:
- name: unit tests ${{ matrix.job.target }} (${{ matrix.job.os }}) / ${{ matrix.archive.name }} / ${{ matrix.nextest.name }}
- runs-on: ${{ matrix.job.os }}
- needs: build-tests
- timeout-minutes: 60
- strategy:
- fail-fast: false
- matrix:
- archive:
- - name: unit-tests
- file: nextest-unit.tar.zst
- job:
- # The OS is used for the runner
- # The target is used by Cargo
- - os: ubuntu-latest
- target: x86_64-unknown-linux-gnu
- - os: ubuntu-latest
- target: aarch64-unknown-linux-gnu
- - os: macos-latest
- target: x86_64-apple-darwin
- - os: macos-latest
- target: aarch64-apple-darwin
- - os: windows-latest
- target: x86_64-pc-windows-msvc
- nextest:
- - name: non-forking
- filter: "!test(~fork) & !test(~live) & !test(~forge_std) & !test(~deploy_and_simulate)"
- env:
- ETH_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/C3JEvfW6VgtqZQa-Qp1E-2srEiIc02sD
- steps:
- - uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@stable
- with:
- targets: ${{ matrix.job.target }}
- - uses: taiki-e/install-action@nextest
- - name: Download archives
- uses: actions/download-artifact@v3
- with:
- name: ${{ matrix.job.target }}-${{ matrix.archive.name }}
- - name: Setup git config
- run: |
- git config --global user.name "GitHub Actions Bot"
- git config --global user.email "<>"
-
- - name: cargo nextest
- shell: bash
- run: |
- # see https://github.com/foundry-rs/foundry/pull/3959
- export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
- cargo nextest run --retries 3 --archive-file ${{ matrix.job.target }}-${{ matrix.archive.file }} -E '${{ matrix.nextest.filter }}'
-
- integration:
- name:
- integration tests ${{ matrix.job.target }} (${{ matrix.job.os }}) / ${{
- matrix.archive.name }} / ${{ matrix.nextest.name }}
- runs-on: ${{ matrix.job.os }}
- timeout-minutes: 60
- needs: build-tests
- strategy:
- fail-fast: false
- matrix:
- archive:
- - name: integration-tests
- file: nextest-integration.tar.zst
- job:
- # The OS is used for the runner
- # The target is used by Cargo
- - os: ubuntu-latest
- target: x86_64-unknown-linux-gnu
- - os: ubuntu-latest
- target: aarch64-unknown-linux-gnu
- - os: macos-latest
- target: x86_64-apple-darwin
- - os: macos-latest
- target: aarch64-apple-darwin
- - os: windows-latest
- target: x86_64-pc-windows-msvc
- nextest:
- - name: non-forking
- # skip fork,verify,forge-std and script tests that use heavy simulation
- filter: "!test(~fork) & !test(~live) & !test(~forge_std) & !test(~deploy_and_simulate)"
- # the aarch64-apple-darwin runner is particularly slow with script related tests
- macos-aarch-filter: "!test(~fork) & !test(~live) & !test(~forge_std) & !test(~deploy_)"
- env:
- ETH_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/C3JEvfW6VgtqZQa-Qp1E-2srEiIc02sD
- steps:
- - uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@stable
- - uses: taiki-e/install-action@nextest
- - name: Download archives
- uses: actions/download-artifact@v3
- with:
- name: ${{ matrix.job.target }}-${{ matrix.archive.name }}
-
- - name: Forge RPC cache
- uses: actions/cache@v3
- if: matrix.nextest.name != 'non-forking'
- with:
- path: "$HOME/.foundry/cache"
- key: rpc-cache-${{ hashFiles('crates/forge/tests/rpc-cache-keyfile') }}
- - name: Setup git config
- run: |
- git config --global user.name "GitHub Actions Bot"
- git config --global user.email "<>"
-
- - name: cargo nextest
- if: ${{ matrix.job.target == 'aarch64-apple-darwin' }}
- shell: bash
- run: |
- # see https://github.com/foundry-rs/foundry/pull/3959
- export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
- cargo nextest run --retries 3 --archive-file ${{ matrix.job.target }}-${{ matrix.archive.file }} -E '${{ matrix.nextest.macos-aarch-filter }}'
-
- - name: cargo nextest
- if: ${{ matrix.job.target != 'aarch64-apple-darwin' }}
- shell: bash
- run: |
- # see https://github.com/foundry-rs/foundry/pull/3959
- export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
- cargo nextest run --retries 3 --archive-file ${{ matrix.job.target }}-${{ matrix.archive.file }} -E '${{ matrix.nextest.filter }}'
diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml
index 9fac75ef56019..d0a5e2f35df4a 100644
--- a/.github/workflows/deny.yml
+++ b/.github/workflows/deny.yml
@@ -3,10 +3,10 @@ name: deny
on:
push:
branches: [master]
- paths: [Cargo.lock]
+ paths: [Cargo.lock, deny.toml]
pull_request:
branches: [master]
- paths: [Cargo.lock]
+ paths: [Cargo.lock, deny.toml]
env:
CARGO_TERM_COLOR: always
@@ -15,6 +15,7 @@ jobs:
cargo-deny:
name: cargo deny check
runs-on: ubuntu-latest
+ timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: EmbarkStudios/cargo-deny-action@v1
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index e731a7a56923f..531480b8232b1 100644
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@@ -3,59 +3,62 @@
name: Update Dependencies
on:
- schedule:
- # Run weekly
- - cron: "0 0 * * SUN"
- workflow_dispatch:
- # Needed so we can run it manually
+ schedule:
+ # Run weekly
+ - cron: "0 0 * * SUN"
+ workflow_dispatch:
+ # Needed so we can run it manually
env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- BRANCH: cargo-update
- TITLE: "chore(deps): weekly `cargo update`"
- BODY: |
- Automation to keep dependencies in `Cargo.lock` current.
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ BRANCH: cargo-update
+ TITLE: "chore(deps): weekly `cargo update`"
+ BODY: |
+ Automation to keep dependencies in `Cargo.lock` current.
- cargo update log
-
+ cargo update log
+
- ```log
- $cargo_update_log
- ```
+ ```log
+ $cargo_update_log
+ ```
-
-
+