Skip to content

Commit 9804c2e

Browse files
committed
Merge branch 'master' into refactor/anvil_txtype_enveloppe_macro
2 parents 0983417 + ac00e0b commit 9804c2e

File tree

115 files changed

+4581
-1345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+4581
-1345
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ the requirements below.
44
55
Bug fixes and new features should include tests.
66
7-
Contributors guide: https://github.com/foundry-rs/foundry/blob/master/CONTRIBUTING.md
7+
Contributors guide: https://github.com/foundry-rs/foundry/blob/HEAD/CONTRIBUTING.md
88
99
The contributors guide includes instructions for running rustfmt and building the
1010
documentation.

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@v5
5959
with:
6060
persist-credentials: false
61-
- uses: crate-ci/typos@80c8a4945eec0f6d464eaf9e65ed98ef085283d1 # v1
61+
- uses: crate-ci/typos@07d900b8fa1097806b8adb6391b0d3e0ac2fdea7 # v1
6262

6363
clippy:
6464
runs-on: depot-ubuntu-latest
@@ -127,7 +127,7 @@ jobs:
127127
with:
128128
toolchain: stable
129129
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
130-
- uses: taiki-e/install-action@0ed4032d5406d133639ce4e858011eb498223338 # v2
130+
- uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2
131131
with:
132132
tool: cargo-hack
133133
- uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9

.github/workflows/docker-publish.yml

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,47 @@ name: docker
33
permissions: {}
44

55
on:
6-
# Trigger without any parameters a proactive rebuild
7-
workflow_dispatch: {}
6+
workflow_dispatch:
7+
inputs:
8+
tag_name:
9+
default: nightly
10+
description: The tag we're building for
11+
type: string
812
workflow_call:
913
inputs:
1014
tag_name:
1115
required: true
1216
type: string
1317

18+
concurrency:
19+
group: docker-${{ github.head_ref }}
20+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
21+
1422
env:
1523
REGISTRY: ghcr.io
16-
# Will resolve to foundry-rs/foundry
1724
IMAGE_NAME: ${{ github.repository }}
1825

26+
# Keep in sync with `release.yml`.
27+
RUST_PROFILE: maxperf
28+
RUST_FEATURES: aws-kms,gcp-kms,turnkey,cli,asm-keccak,js-tracer
29+
1930
jobs:
2031
build:
2132
name: build and push
22-
runs-on: depot-ubuntu-22.04-16
33+
runs-on: depot-ubuntu-latest
2334
permissions:
2435
contents: read
2536
id-token: write
2637
packages: write
27-
timeout-minutes: 120
38+
timeout-minutes: 60
2839
steps:
2940
- uses: actions/checkout@v5
3041
with:
3142
persist-credentials: false
32-
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # master
33-
with:
34-
toolchain: stable
35-
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
36-
- name: Install gcc aarch64
37-
id: aarch_64_setup
38-
run: |
39-
sudo apt update && sudo apt install -y gcc-aarch64-linux-gnu
43+
4044
# Login against a Docker registry except on PR
4145
# https://github.com/docker/login-action
4246
- name: Login into registry ${{ env.REGISTRY }}
43-
# Ensure this doesn't trigger on PR's
44-
if: github.event_name != 'pull_request'
4547
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
4648
with:
4749
registry: ${{ env.REGISTRY }}
@@ -52,7 +54,7 @@ jobs:
5254
# https://github.com/docker/metadata-action
5355
- name: Extract Docker metadata
5456
id: meta
55-
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5
57+
uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5
5658
with:
5759
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5860

@@ -80,5 +82,20 @@ jobs:
8082
printf "TAGS -> %s\n" "${{ steps.docker_tagging.outputs.docker_tags }}"
8183
printf "LABELS -> %s\n" "${{ steps.meta.outputs.labels }}"
8284
83-
- name: Build and push foundry image
84-
run: make DOCKER_IMAGE_NAME=${{ steps.docker_tagging.outputs.docker_tags }} CARGO_TAG_NAME=${{ inputs.tag_name }} PROFILE=maxperf docker-build-push
85+
- name: Set up Depot CLI
86+
uses: depot/setup-action@b0b1ea4f69e92ebf5dea3f8713a1b0c37b2126a5 # v1
87+
88+
- name: Build and push Foundry image
89+
uses: depot/build-push-action@9785b135c3c76c33db102e45be96a25ab55cd507 # v1
90+
with:
91+
build-args: |
92+
RUST_PROFILE=${{ env.RUST_PROFILE }}
93+
RUST_FEATURES=${{ env.RUST_FEATURES }}
94+
TAG_NAME=${{ inputs.tag_name }}
95+
VERGEN_GIT_SHA=${{ github.sha }}
96+
project: 8gkbxxjrpw
97+
context: .
98+
tags: ${{ steps.docker_tagging.outputs.docker_tags }}
99+
labels: ${{ steps.meta.outputs.labels }}
100+
platforms: linux/amd64,linux/arm64
101+
push: true

.github/workflows/nix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
contents: write
2020
pull-requests: write
2121
steps:
22-
- uses: DeterminateSystems/determinate-nix-action@762d7fdba79d046449732c729c1d3aaad021baa2 # v3
22+
- uses: DeterminateSystems/determinate-nix-action@75c10b446a77562b7eb5707d019264ab76a18aa4 # v3
2323
- uses: actions/checkout@v5
2424
with:
2525
persist-credentials: false
26-
- uses: DeterminateSystems/update-flake-lock@4d443398067153ddd6191a9d9c89533f9a100c26 # main
26+
- uses: DeterminateSystems/update-flake-lock@e637603d31bed83169f2e56bb475c9dff7af6544 # main
2727
with:
2828
pr-title: "Update flake.lock"
2929
pr-labels: |
@@ -38,7 +38,7 @@ jobs:
3838
permissions:
3939
contents: read
4040
steps:
41-
- uses: DeterminateSystems/determinate-nix-action@762d7fdba79d046449732c729c1d3aaad021baa2 # v3
41+
- uses: DeterminateSystems/determinate-nix-action@75c10b446a77562b7eb5707d019264ab76a18aa4 # v3
4242
- uses: actions/checkout@v5
4343
with:
4444
persist-credentials: false

.github/workflows/release.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ on:
1616
env:
1717
CARGO_TERM_COLOR: always
1818
IS_NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
19-
PROFILE: maxperf
20-
STABLE_VERSION: "v1.4.3"
19+
20+
# Keep in sync with `docker-publish.yml`.
21+
RUST_PROFILE: maxperf
22+
RUST_FEATURES: aws-kms,gcp-kms,turnkey,cli,asm-keccak,js-tracer
23+
24+
LAST_STABLE_VERSION: "v1.4.4"
2125

2226
jobs:
2327
prepare:
@@ -64,7 +68,7 @@ jobs:
6468
6569
- name: Build changelog
6670
id: build_changelog
67-
uses: mikepenz/release-changelog-builder-action@d702b5bb7c23735c8afc130dac9c4c8b8eb669e8 # v6
71+
uses: mikepenz/release-changelog-builder-action@439f79b5b5428107c7688c1d2b0e8bacc9b8792c # v6
6872
with:
6973
configuration: "./.github/changelog.json"
7074
fromTag: ${{ env.IS_NIGHTLY == 'true' && 'nightly' || env.STABLE_VERSION }}
@@ -171,12 +175,12 @@ jobs:
171175
SVM_TARGET_PLATFORM: ${{ matrix.svm_target_platform }}
172176
PLATFORM_NAME: ${{ matrix.platform }}
173177
TARGET: ${{ matrix.target }}
174-
OUT_DIR: target/${{ matrix.target }}/${{ env.PROFILE }}
178+
OUT_DIR: target/${{ matrix.target }}/${{ env.RUST_PROFILE }}
175179
shell: bash
176180
run: |
177181
set -eo pipefail
178-
flags=(--target $TARGET --profile $PROFILE --bins
179-
--no-default-features --features aws-kms,gcp-kms,cli,asm-keccak,js-tracer)
182+
flags=(--target $TARGET --profile $RUST_PROFILE --bins
183+
--no-default-features --features "$RUST_FEATURES")
180184
181185
# `jemalloc` is not fully supported on MSVC or aarch64 Linux.
182186
if [[ "$TARGET" != *msvc* && "$TARGET" != "aarch64-unknown-linux-gnu" ]]; then
@@ -206,7 +210,7 @@ jobs:
206210
id: artifacts
207211
env:
208212
PLATFORM_NAME: ${{ matrix.platform }}
209-
OUT_DIR: target/${{ matrix.target }}/${{ env.PROFILE }}
213+
OUT_DIR: target/${{ matrix.target }}/${{ env.RUST_PROFILE }}
210214
VERSION_NAME: ${{ (env.IS_NIGHTLY == 'true' && 'nightly') || needs.prepare.outputs.tag_name }}
211215
ARCH: ${{ matrix.arch }}
212216
shell: bash
@@ -238,7 +242,7 @@ jobs:
238242
id: man
239243
if: matrix.target == 'x86_64-unknown-linux-gnu'
240244
env:
241-
OUT_DIR: target/${{ matrix.target }}/${{ env.PROFILE }}
245+
OUT_DIR: target/${{ matrix.target }}/${{ env.RUST_PROFILE }}
242246
VERSION_NAME: ${{ (env.IS_NIGHTLY == 'true' && 'nightly') || needs.prepare.outputs.tag_name }}
243247
shell: bash
244248
run: |
@@ -275,7 +279,7 @@ jobs:
275279
276280
# Creates the release for this specific version
277281
- name: Create release
278-
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
282+
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
279283
with:
280284
name: ${{ needs.prepare.outputs.release_name }}
281285
tag_name: ${{ needs.prepare.outputs.tag_name }}
@@ -290,7 +294,7 @@ jobs:
290294
# tagged `nightly` for compatibility with `foundryup`
291295
- name: Update nightly release
292296
if: ${{ env.IS_NIGHTLY == 'true' }}
293-
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
297+
uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
294298
with:
295299
name: "Nightly"
296300
tag_name: "nightly"

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
toolchain: stable
6666
target: ${{ matrix.target }}
6767
- uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
68-
- uses: taiki-e/install-action@0ed4032d5406d133639ce4e858011eb498223338 # v2
68+
- uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2
6969
with:
7070
tool: nextest
7171

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ If you are working in VSCode, we recommend you install the [rust-analyzer](https
131131

132132
If you are working on a larger feature, we encourage you to open up a draft pull request, to make sure that other contributors are not duplicating work.
133133

134-
If you would like to test the binaries built from your change, see [foundryup](https://github.com/foundry-rs/foundry/tree/master/foundryup).
134+
If you would like to test the binaries built from your change, see [foundryup](https://github.com/foundry-rs/foundry/tree/HEAD/foundryup).
135135

136-
If you would like to use a debugger with breakpoints to debug a patch you might be working on, keep in mind we currently strip debug info for faster builds, which is _not_ the default. Therefore, to use a debugger, you need to enable it on the workspace [`Cargo.toml`'s `dev` profile](https://github.com/foundry-rs/foundry/tree/master/Cargo.toml#L15-L18).
136+
If you would like to use a debugger with breakpoints to debug a patch you might be working on, keep in mind we currently strip debug info for faster builds, which is _not_ the default. Therefore, to use a debugger, you need to enable it on the workspace [`Cargo.toml`'s `dev` profile](https://github.com/foundry-rs/foundry/tree/HEAD/Cargo.toml#L15-L18).
137137

138138
#### Adding tests
139139

0 commit comments

Comments
 (0)