This commit is contained in:
Omar Abdulla
2025-11-10 12:16:05 +03:00
parent 890a93132d
commit 8e0de8f390
+12 -12
View File
@@ -81,7 +81,7 @@ jobs:
needs: cache-polkadot needs: cache-polkadot
strategy: strategy:
matrix: matrix:
os: [ubuntu-24.04, macos-14] os: [ubuntu-24.04, macos-latest]
env: env:
SCCACHE_GHA_ENABLED: "true" SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache" RUSTC_WRAPPER: "sccache"
@@ -147,7 +147,7 @@ jobs:
chmod +x resolc chmod +x resolc
sudo mv resolc /usr/local/bin sudo mv resolc /usr/local/bin
- name: Install Geth on macOS - name: Install Geth on macOS
if: matrix.os == 'macos-14' if: matrix.os == 'macos-latest'
run: | run: |
brew tap ethereum/ethereum brew tap ethereum/ethereum
brew install ethereum protobuf brew install ethereum protobuf
@@ -158,7 +158,7 @@ jobs:
chmod +x resolc chmod +x resolc
sudo mv resolc /usr/local/bin sudo mv resolc /usr/local/bin
- name: Install Kurtosis on macOS - name: Install Kurtosis on macOS
if: matrix.os == 'macos-14' if: matrix.os == 'macos-latest'
run: brew install kurtosis-tech/tap/kurtosis-cli run: brew install kurtosis-tech/tap/kurtosis-cli
- name: Install Kurtosis on Ubuntu - name: Install Kurtosis on Ubuntu
if: matrix.os == 'ubuntu-24.04' if: matrix.os == 'ubuntu-24.04'
@@ -173,7 +173,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-24.04, macos-14] os: [ubuntu-24.04, macos-latest]
env: env:
SCCACHE_GHA_ENABLED: "true" SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache" RUSTC_WRAPPER: "sccache"
@@ -200,7 +200,7 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y protobuf-compiler clang libclang-dev sudo apt-get install -y protobuf-compiler clang libclang-dev
- name: Install dependencies (macOS) - name: Install dependencies (macOS)
if: matrix.os == 'macos-14' if: matrix.os == 'macos-latest'
run: brew install protobuf llvm run: brew install protobuf llvm
- name: Caching Step - name: Caching Step
@@ -269,7 +269,7 @@ jobs:
# runs-on: ${{ matrix.os }} # runs-on: ${{ matrix.os }}
# strategy: # strategy:
# matrix: # matrix:
# os: [ubuntu-24.04, macos-14] # os: [ubuntu-24.04, macos-latest]
# steps: # steps:
# - name: Checkout repo and submodules # - name: Checkout repo and submodules
@@ -286,7 +286,7 @@ jobs:
# rustup component add rust-src # rustup component add rust-src
# - name: Install dependencies (macOS) # - name: Install dependencies (macOS)
# if: matrix.os == 'macos-14' # if: matrix.os == 'macos-latest'
# run: | # run: |
# brew install protobuf # brew install protobuf
# rustup target add wasm32-unknown-unknown # rustup target add wasm32-unknown-unknown
@@ -325,7 +325,7 @@ jobs:
# key: polkadot-downloaded-${{ matrix.os }}-${{ env.POLKADOT_VERSION }} # key: polkadot-downloaded-${{ matrix.os }}-${{ env.POLKADOT_VERSION }}
# - name: Download Polkadot binaries on macOS # - name: Download Polkadot binaries on macOS
# if: matrix.os == 'macos-14' && steps.cache-polkadot.outputs.cache-hit != 'true' # if: matrix.os == 'macos-latest' && steps.cache-polkadot.outputs.cache-hit != 'true'
# run: | # run: |
# mkdir -p ~/polkadot-cache # mkdir -p ~/polkadot-cache
# curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-aarch64-apple-darwin -o ~/polkadot-cache/polkadot # curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/${{ env.POLKADOT_VERSION }}/polkadot-aarch64-apple-darwin -o ~/polkadot-cache/polkadot
@@ -350,7 +350,7 @@ jobs:
# runs-on: ${{ matrix.os }} # runs-on: ${{ matrix.os }}
# strategy: # strategy:
# matrix: # matrix:
# os: [ubuntu-24.04, macos-14] # os: [ubuntu-24.04, macos-latest]
# steps: # steps:
# - name: Checkout repo # - name: Checkout repo
@@ -428,7 +428,7 @@ jobs:
# sudo mv resolc /usr/local/bin # sudo mv resolc /usr/local/bin
# - name: Install Geth on macOS # - name: Install Geth on macOS
# if: matrix.os == 'macos-14' # if: matrix.os == 'macos-latest'
# run: | # run: |
# brew tap ethereum/ethereum # brew tap ethereum/ethereum
# brew install ethereum protobuf # brew install ethereum protobuf
@@ -440,7 +440,7 @@ jobs:
# sudo mv resolc /usr/local/bin # sudo mv resolc /usr/local/bin
# - name: Install Kurtosis on macOS # - name: Install Kurtosis on macOS
# if: matrix.os == 'macos-14' # if: matrix.os == 'macos-latest'
# run: brew install kurtosis-tech/tap/kurtosis-cli # run: brew install kurtosis-tech/tap/kurtosis-cli
# - name: Install Kurtosis on Ubuntu # - name: Install Kurtosis on Ubuntu
@@ -501,6 +501,6 @@ jobs:
# # We can't install docker in the MacOS image used in CI and therefore we need to skip the # # We can't install docker in the MacOS image used in CI and therefore we need to skip the
# # Kurtosis and lighthouse related tests when running the CI on MacOS. # # Kurtosis and lighthouse related tests when running the CI on MacOS.
# - name: Unit Tests # - name: Unit Tests
# if: matrix.os == 'macos-14' # if: matrix.os == 'macos-latest'
# run: | # run: |
# cargo test --workspace -- --nocapture --skip lighthouse_geth::tests:: # cargo test --workspace -- --nocapture --skip lighthouse_geth::tests::