feat: Upstream 9f11e6df

.config/nextest.toml

@@ -1,5 +1,5 @@
 [profile.default]
-retries = { backoff = "exponential", count = 2, delay = "2s", jitter = true }
+retries = { backoff = "exponential", count = 2, delay = "3s", jitter = true }
 slow-timeout = { period = "1m", terminate-after = 3 }
 
 [[profile.default.overrides]]

.github/ISSUE_TEMPLATE/BUG-FORM.yml

@@ -30,6 +30,10 @@ body:
       attributes:
           label: What version of Foundry are you on?
           placeholder: "Run forge --version and paste the output here"
+    - type: input
+      attributes:
+          label: What version of Foundryup are you on?
+          placeholder: "Run foundryup --version and paste the output here"
     - type: input
       attributes:
           label: What command(s) is the bug in?
@@ -49,4 +53,4 @@ body:
           label: Describe the bug
           description: Please include relevant Solidity snippets as well if relevant.
       validations:
-          required: true
+          required: true

.github/scripts/format.sh

@@ -3,5 +3,5 @@ set -eo pipefail
 
 # We have to ignore at shell level because testdata/ is not a valid Foundry project,
 # so running `forge fmt` with `--root testdata` won't actually check anything
-shopt -s extglob
-cargo run --bin forge -- fmt "$@" $(find testdata -name '*.sol' ! -name Vm.sol)
+cargo run --bin forge -- fmt "$@" \
+    $(find testdata -name '*.sol' ! -name Vm.sol ! -name console.sol)

.github/workflows/dependencies.yml

@@ -9,22 +9,9 @@ on:
   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.
-
-    <details><summary><strong>cargo update log</strong></summary>
-    <p>
-
-    ```log
-    $cargo_update_log
-    ```
-
-    </p>
-    </details>
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
     update:
@@ -37,28 +24,28 @@ jobs:
               with:
                   toolchain: nightly-2024-09-01
 
-      - name: cargo update
-        # Remove first line that always just says "Updating crates.io index"
-        run: cargo update --color never 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
+            - name: cargo update
+              # Remove first line that always just says "Updating crates.io index"
+              run: cargo update --color never 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
 
-      - name: craft commit message and PR body
-        id: msg
-        run: |
-          export cargo_update_log="$(cat cargo_update.log)"
+            - name: craft commit message and PR body
+              id: msg
+              run: |
+                export cargo_update_log="$(cat cargo_update.log)"
 
-          echo "commit_message<<EOF" >> $GITHUB_OUTPUT
-          printf "$TITLE\n\n$cargo_update_log\n" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
+                echo "commit_message<<EOF" >> $GITHUB_OUTPUT
+                printf "$TITLE\n\n$cargo_update_log\n" >> $GITHUB_OUTPUT
+                echo "EOF" >> $GITHUB_OUTPUT
 
-          echo "body<<EOF" >> $GITHUB_OUTPUT
-          echo "$BODY" | envsubst >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
+                echo "body<<EOF" >> $GITHUB_OUTPUT
+                echo "$BODY" | envsubst >> $GITHUB_OUTPUT
+                echo "EOF" >> $GITHUB_OUTPUT
 
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        with:
-          add-paths: ./Cargo.lock
-          commit-message: ${{ steps.msg.outputs.commit_message }}
-          title: ${{ env.TITLE }}
-          body: ${{ steps.msg.outputs.body }}
-          branch: ${{ env.BRANCH }}
+            - name: Create Pull Request
+              uses: peter-evans/create-pull-request@v6
+              with:
+                add-paths: ./Cargo.lock
+                commit-message: ${{ steps.msg.outputs.commit_message }}
+                title: ${{ env.TITLE }}
+                body: ${{ steps.msg.outputs.body }}
+                branch: ${{ env.BRANCH }}

.github/workflows/nextest.yml

@@ -15,6 +15,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: full
 
 jobs:
   matrices:

.github/workflows/release.yml

@@ -158,6 +158,7 @@ jobs:
       # We diverge from upstream and build with cross as we're building static binaries
       - name: Build binaries
         env:
+          TAG_NAME: ${{ (env.IS_NIGHTLY == 'true' && 'nightly') || needs.prepare.outputs.tag_name }}
           SVM_TARGET_PLATFORM: ${{ matrix.svm_target_platform }}
         shell: bash
         run: |

.github/workflows/test.yml

@@ -17,6 +17,7 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   TARGET_RUST_VERSION: "stable"
+  RUST_BACKTRACE: full
 
 jobs:
   nextest:

.gitignore

@@ -1,5 +1,5 @@
 .DS_STORE
-/target
+/target*
 out/
 snapshots/
 out.json