Skip to content

Commit a53dda8

Browse files
authored
Merge branch 'master' into feat/browser-wallet-support
2 parents 3af77c1 + e44249a commit a53dda8

25 files changed

+370
-306
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ testdata/cheats/Vm.sol linguist-generated
44
# See <https://git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header>
55
*.rs diff=rust
66
crates/lint/testdata/* text eol=lf
7+
8+
dprint.json linguist-language=JSON-with-Comments
9+
.devcontainer/devcontainer.json linguist-language=JSON-with-Comments

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ the code change.
3131

3232
- [ ] Added Tests
3333
- [ ] Added Documentation
34-
- [ ] Breaking changes
34+
- [ ] Breaking changes

.github/workflows/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
# Run weekly
88
- cron: "0 0 * * SUN"
99
workflow_dispatch:
10-
# Needed so we can run it manually
10+
# Needed so we can run it manually
1111

1212
permissions:
1313
contents: write

.github/workflows/docker-publish.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ jobs:
4040
if: github.event_name != 'pull_request'
4141
uses: docker/login-action@v2
4242
with:
43-
registry: ${{ env.REGISTRY }}
44-
username: ${{ github.actor }}
45-
password: ${{ secrets.GITHUB_TOKEN }}
43+
registry: ${{ env.REGISTRY }}
44+
username: ${{ github.actor }}
45+
password: ${{ secrets.GITHUB_TOKEN }}
4646

4747
# Extract metadata (tags, labels) for Docker
4848
# https://github.com/docker/metadata-action
4949
- name: Extract Docker metadata
5050
id: meta
5151
uses: docker/metadata-action@v4
5252
with:
53-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
53+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5454

5555
# Creates an additional 'latest' or 'nightly' tag
5656
# If the job is triggered via cron schedule, tag nightly and nightly-{SHA}
@@ -59,22 +59,22 @@ jobs:
5959
- name: Finalize Docker Metadata
6060
id: docker_tagging
6161
run: |
62-
if [[ "${{ github.event_name }}" == 'schedule' ]]; then
63-
echo "cron trigger, assigning nightly tag"
64-
echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly-${GITHUB_SHA}" >> $GITHUB_OUTPUT
65-
elif [[ "${GITHUB_REF##*/}" == "main" ]] || [[ ${GITHUB_REF##*/} == "master" ]]; then
66-
echo "manual trigger from master/main branch, assigning latest tag"
67-
echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF##*/},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" >> $GITHUB_OUTPUT
68-
else
69-
echo "Neither scheduled nor manual release from main branch. Just tagging as branch name"
70-
echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF##*/}" >> $GITHUB_OUTPUT
71-
fi
62+
if [[ "${{ github.event_name }}" == 'schedule' ]]; then
63+
echo "cron trigger, assigning nightly tag"
64+
echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly-${GITHUB_SHA}" >> $GITHUB_OUTPUT
65+
elif [[ "${GITHUB_REF##*/}" == "main" ]] || [[ ${GITHUB_REF##*/} == "master" ]]; then
66+
echo "manual trigger from master/main branch, assigning latest tag"
67+
echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF##*/},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" >> $GITHUB_OUTPUT
68+
else
69+
echo "Neither scheduled nor manual release from main branch. Just tagging as branch name"
70+
echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF##*/}" >> $GITHUB_OUTPUT
71+
fi
7272
7373
# Log docker metadata to explicitly know what is being pushed
7474
- name: Inspect Docker Metadata
7575
run: |
76-
echo "TAGS -> ${{ steps.docker_tagging.outputs.docker_tags }}"
77-
echo "LABELS -> ${{ steps.meta.outputs.labels }}"
76+
echo "TAGS -> ${{ steps.docker_tagging.outputs.docker_tags }}"
77+
echo "LABELS -> ${{ steps.meta.outputs.labels }}"
7878
7979
- name: Build and push foundry image
8080
run: make DOCKER_IMAGE_NAME=${{ steps.docker_tagging.outputs.docker_tags }} CARGO_TAG_NAME=${{ inputs.tag_name }} PROFILE=maxperf docker-build-push

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
# Run weekly
66
- cron: "0 0 * * SUN"
77
workflow_dispatch:
8-
# Needed so we can run it manually
8+
# Needed so we can run it manually
99

1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
shell: bash
159159
run: |
160160
set -eo pipefail
161-
flags=(--target $TARGET --profile $PROFILE --bins
161+
flags=(--target $TARGET --profile $PROFILE --bins
162162
--no-default-features --features aws-kms,gcp-kms,cli,asm-keccak)
163163
164164
# `jemalloc` is not fully supported on MSVC or aarch64 Linux.

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,8 @@ out.json
77
.vscode
88
.claude
99
CLAUDE.md
10+
.env
11+
node_modules
12+
dist
13+
bin
14+
_

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ Be aware that _how_ you communicate requests and reviews in your feedback can ha
186186

187187
##### Abandoned or stale pull requests
188188

189-
If a pull request appears to be abandoned or stalled, it is polite to first check with the contributor to see if they intend to continue the work before checking if they would mind if you took it over (especially if it just has nits left). When doing so, it is courteous to give the original contributor credit for the work they started, either by preserving their name and e-mail address in the commit log, or by using the `Author: ` or `Co-authored-by: ` metadata tag in the commits.
189+
If a pull request appears to be abandoned or stalled, it is polite to first check with the contributor to see if they intend to continue the work before checking if they would mind if you took it over (especially if it just has nits left). When doing so, it is courteous to give the original contributor credit for the work they started, either by preserving their name and e-mail address in the commit log, or by using the `Author:` or `Co-authored-by:` metadata tag in the commits.
190190

191191
_Adapted from the [ethers-rs contributing guide](https://github.com/gakonst/ethers-rs/blob/master/CONTRIBUTING.md)_.
192192

0 commit comments

Comments
 (0)