@@ -361,7 +361,16 @@ jobs:
361361 echo "RUST_VERSION=${RUST_VERSION}" >> $GITHUB_ENV
362362 - name : Set up Homebrew
363363 uses : Homebrew/actions/setup-homebrew@1ccc07ccd54b6048295516a3eb89b192c35057dc # master from 12.09.2024
364+ # Is broken because of different bash versions
365+ # - name: Install rust ${{ env.RUST_VERSION }}
366+ # uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
367+ # with:
368+ # cache: false
369+ # toolchain: ${{ env.RUST_VERSION }}
370+ # target: wasm32-unknown-unknown
371+ # components: cargo, clippy, rust-docs, rust-src, rustfmt, rustc, rust-std
364372 - name : Install rust ${{ env.RUST_VERSION }}
373+ <<<<<<< HEAD
365374 uses : actions-rust-lang/setup-rust-toolchain@9d7e65c320fdb52dcd45ffaa68deb6c02c8754d9 # v1.12.0
366375 with :
367376 cache : false
@@ -370,14 +379,42 @@ jobs:
370379 components : cargo, clippy, rust-docs, rust-src, rustfmt, rustc, rust-std
371380 - name : Install protobuf
372381 run : brew install protobuf
382+ =======
383+ run : |
384+ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VERSION
385+ source $HOME/.cargo/env
386+ rustup target add wasm32-unknown-unknown
387+ rustup component add clippy rust-docs rust-src rustfmt rustc rust-std
388+ - name : Install protobuf
389+ run : brew install protobuf
390+ - name : install solc
391+ run : brew install solidity
392+ - name : Install resolc
393+ run : |
394+ source $HOME/.cargo/env
395+ VERSION="0.3.0"
396+ ASSET_URL="https://github.com/paritytech/revive/releases/download/v$VERSION/resolc-universal-apple-darwin"
397+ echo "Downloading resolc v$VERSION from $ASSET_URL"
398+ curl -Lsf --show-error -o $HOME/.cargo/bin/resolc "$ASSET_URL"
399+ chmod +x $HOME/.cargo/bin/resolc
400+ xattr -c $HOME/.cargo/bin/resolc
401+ resolc --version
402+ - name : Install llvm
403+ run : |
404+ brew install llvm@20
405+ brew link llvm@20
406+ >>>>>>> 73de3bed (ci: fix cargo-check-all-crate-macos (#10268))
373407 - name : cargo info
374408 run : |
409+ source $HOME/.cargo/env
375410 echo "######## rustup show ########"
376411 rustup show
377412 echo "######## cargo --version ########"
378413 cargo --version
379414 - name : Run cargo check
380- run : cargo check --workspace --locked
415+ run : |
416+ source $HOME/.cargo/env
417+ cargo check --workspace --locked
381418
382419 confirm-required-test-misc-jobs-passed :
383420 runs-on : ubuntu-latest
0 commit comments