@@ -357,6 +357,7 @@ jobs:
357357 echo $RUST_VERSION
358358 echo "RUST_VERSION=${RUST_VERSION}" >> $GITHUB_ENV
359359 - name : Set up Homebrew
360+ <<<<<<< HEAD
360361 uses : Homebrew/actions/setup-homebrew@1ccc07ccd54b6048295516a3eb89b192c35057dc # stable2503 from 12.09.2024
361362 - name : Install rust ${{ env.RUST_VERSION }}
362363 uses : actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
@@ -367,14 +368,52 @@ jobs:
367368 components : cargo, clippy, rust-docs, rust-src, rustfmt, rustc, rust-std
368369 - name : Install protobuf
369370 run : brew install protobuf
371+ =======
372+ uses : Homebrew/actions/setup-homebrew@1ccc07ccd54b6048295516a3eb89b192c35057dc # master from 12.09.2024
373+ # Is broken because of different bash versions
374+ # - name: Install rust ${{ env.RUST_VERSION }}
375+ # uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
376+ # with:
377+ # cache: false
378+ # toolchain: ${{ env.RUST_VERSION }}
379+ # target: wasm32-unknown-unknown
380+ # components: cargo, clippy, rust-docs, rust-src, rustfmt, rustc, rust-std
381+ - name : Install rust ${{ env.RUST_VERSION }}
382+ run : |
383+ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VERSION
384+ source $HOME/.cargo/env
385+ rustup target add wasm32-unknown-unknown
386+ rustup component add clippy rust-docs rust-src rustfmt rustc rust-std
387+ - name : Install protobuf
388+ run : brew install protobuf
389+ - name : install solc
390+ run : brew install solidity
391+ - name : Install resolc
392+ run : |
393+ source $HOME/.cargo/env
394+ VERSION="0.3.0"
395+ ASSET_URL="https://github.com/paritytech/revive/releases/download/v$VERSION/resolc-universal-apple-darwin"
396+ echo "Downloading resolc v$VERSION from $ASSET_URL"
397+ curl -Lsf --show-error -o $HOME/.cargo/bin/resolc "$ASSET_URL"
398+ chmod +x $HOME/.cargo/bin/resolc
399+ xattr -c $HOME/.cargo/bin/resolc
400+ resolc --version
401+ - name : Install llvm
402+ run : |
403+ brew install llvm@20
404+ brew link llvm@20
405+ >>>>>>> 73de3be (ci: fix cargo-check-all-crate-macos (#10268))
370406 - name : cargo info
371407 run : |
408+ source $HOME/.cargo/env
372409 echo "######## rustup show ########"
373410 rustup show
374411 echo "######## cargo --version ########"
375412 cargo --version
376413 - name : Run cargo check
377- run : cargo check --workspace --locked
414+ run : |
415+ source $HOME/.cargo/env
416+ cargo check --workspace --locked
378417
379418 confirm-required-test-misc-jobs-passed :
380419 runs-on : ubuntu-latest
0 commit comments