Merge branch 'sigp:stable' into stable

chong-he · Jul 15, 2023 · 9a5626d · 9a5626d
2 parents a16e8ef + dfcb336
commit 9a5626d
Show file tree

Hide file tree

Showing 215 changed files with 6,978 additions and 2,816 deletions.
diff --git a/.github/workflows/publish-crate.yml b/.github/workflows/publish-crate.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -134,17 +134,11 @@ jobs:
 
             - name: Build Lighthouse for Windows portable
               if:   matrix.arch == 'x86_64-windows-portable'
-              # NOTE: profile set to release until this rustc issue is fixed:
-              #
-              # https://github.com/rust-lang/rust/issues/107781
-              #
-              # tracked at: https://github.com/sigp/lighthouse/issues/3964
-              run:  cargo install --path lighthouse --force --locked --features portable,gnosis --profile release
+              run:  cargo install --path lighthouse --force --locked --features portable,gnosis --profile ${{ matrix.profile }}
 
             - name: Build Lighthouse for Windows modern
               if:   matrix.arch == 'x86_64-windows'
-              # NOTE: profile set to release (see above)
-              run:  cargo install --path lighthouse --force --locked --features modern,gnosis --profile release
+              run:  cargo install --path lighthouse --force --locked --features modern,gnosis --profile ${{ matrix.profile }}
 
             - name: Configure GPG and create artifacts
               if: startsWith(matrix.arch, 'x86_64-windows') != true

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -79,7 +79,8 @@ jobs:
         choco install python protoc visualstudio2019-workload-vctools -y
         npm config set msvs_version 2019
     - name: Install anvil
-      run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil
+      # Extra feature to work around https://github.com/foundry-rs/foundry/issues/5115
+      run: cargo install --git https://github.com/foundry-rs/foundry --locked anvil --features ethers/ipc
     - name: Install make
       run: choco install -y make
     - uses: KyleMayes/install-llvm-action@v1