@@ -358,7 +358,16 @@ jobs:
358358 echo "RUST_VERSION=${RUST_VERSION}" >> $GITHUB_ENV
359359 - name : Set up Homebrew
360360 uses : Homebrew/actions/setup-homebrew@1ccc07ccd54b6048295516a3eb89b192c35057dc # master from 12.09.2024
361+ # Is broken because of different bash versions
362+ # - name: Install rust ${{ env.RUST_VERSION }}
363+ # uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
364+ # with:
365+ # cache: false
366+ # toolchain: ${{ env.RUST_VERSION }}
367+ # target: wasm32-unknown-unknown
368+ # components: cargo, clippy, rust-docs, rust-src, rustfmt, rustc, rust-std
361369 - name : Install rust ${{ env.RUST_VERSION }}
370+ <<<<<<< HEAD
362371 uses : actions-rust-lang/setup-rust-toolchain@9d7e65c320fdb52dcd45ffaa68deb6c02c8754d9 # v1.12.0
363372 with :
364373 cache : false
@@ -367,14 +376,42 @@ jobs:
367376 components : cargo, clippy, rust-docs, rust-src, rustfmt, rustc, rust-std
368377 - name : Install protobuf
369378 run : brew install protobuf
379+ =======
380+ run : |
381+ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VERSION
382+ source $HOME/.cargo/env
383+ rustup target add wasm32-unknown-unknown
384+ rustup component add clippy rust-docs rust-src rustfmt rustc rust-std
385+ - name : Install protobuf
386+ run : brew install protobuf
387+ - name : install solc
388+ run : brew install solidity
389+ - name : Install resolc
390+ run : |
391+ source $HOME/.cargo/env
392+ VERSION="0.3.0"
393+ ASSET_URL="https://github.com/paritytech/revive/releases/download/v$VERSION/resolc-universal-apple-darwin"
394+ echo "Downloading resolc v$VERSION from $ASSET_URL"
395+ curl -Lsf --show-error -o $HOME/.cargo/bin/resolc "$ASSET_URL"
396+ chmod +x $HOME/.cargo/bin/resolc
397+ xattr -c $HOME/.cargo/bin/resolc
398+ resolc --version
399+ - name : Install llvm
400+ run : |
401+ brew install llvm@20
402+ brew link llvm@20
403+ >>>>>>> 73de3bed (ci: fix cargo-check-all-crate-macos (#10268))
370404 - name : cargo info
371405 run : |
406+ source $HOME/.cargo/env
372407 echo "######## rustup show ########"
373408 rustup show
374409 echo "######## cargo --version ########"
375410 cargo --version
376411 - name : Run cargo check
377- run : cargo check --workspace --locked
412+ run : |
413+ source $HOME/.cargo/env
414+ cargo check --workspace --locked
378415
379416 confirm-required-test-misc-jobs-passed :
380417 runs-on : ubuntu-latest
0 commit comments