Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/matrices.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def __init__(

profile = os.environ.get("PROFILE")
is_pr = os.environ.get("EVENT_NAME") == "pull_request"
t_linux_x86 = Target("ubuntu-latest", "x86_64-unknown-linux-gnu", "linux-amd64")
t_linux_x86 = Target("parity-large-new", "x86_64-unknown-linux-gnu", "linux-amd64")
# TODO: Figure out how to make this work
# t_linux_arm = Target("ubuntu-latest", "aarch64-unknown-linux-gnu", "linux-aarch64")
t_macos = Target("macos-latest", "aarch64-apple-darwin", "macosx-aarch64")
Expand Down
54 changes: 26 additions & 28 deletions .github/workflows/nextest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
matrix:
include:
- os: ubuntu
runner: ubuntu-latest
runner: parity-large-new
- os: macos
runner: macos-latest
- os: windows
Expand All @@ -75,17 +75,16 @@ jobs:
key: eth-rpc-${{ matrix.runner }}-${{ env.ETH_RPC_VERSION }}

# Install dependencies for building
- name: Install protobuf-compiler
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install clang on ubuntu
if: matrix.os == 'ubuntu'
run: |
sudo apt-get update
sudo apt-get install -y clang libclang-dev
sudo apt-get install -y clang libclang-dev unzip build-essential

- name: Install protobuf-compiler
uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

# macOS-specific setup
- name: Install libusb 1.0.27 (macOS)
Expand Down Expand Up @@ -141,7 +140,7 @@ jobs:
test:
name: test ${{ matrix.name }}
runs-on: ${{ matrix.runner_label }}
timeout-minutes: 60
timeout-minutes: 90
needs: [matrices, cache-binaries]
strategy:
fail-fast: false
Expand All @@ -167,6 +166,12 @@ jobs:
key: eth-rpc-${{ matrix.runner_label }}-${{ env.ETH_RPC_VERSION }}
fail-on-cache-miss: ${{ !contains(matrix.runner_label, 'windows') }}

- name: Install dependencies for building (Ubuntu)
if: contains(matrix.runner_label, 'parity-large-new')
run: |
sudo apt-get update
sudo apt-get install -y clang libclang-dev unzip build-essential

- name: Setup Node.js
if: contains(matrix.name, 'external')
uses: actions/setup-node@v4
Expand All @@ -183,6 +188,19 @@ jobs:
python-version: 3.11
- name: Install Vyper
run: pip --version && pip install vyper==0.4.3
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
target: ${{ matrix.target }}, wasm32-unknown-unknown
components: rust-src

- name: Install clang (macOS)
if: contains(matrix.runner_label, 'macos')
run: |
brew install llvm
brew link llvm
echo "LLVM_CONFIG_PATH=$(brew --prefix llvm)/bin/llvm-config" >> $GITHUB_ENV
echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" >> $GITHUB_ENV
- name: Install Resolc
run: |
cargo install rvm-rs
Expand Down Expand Up @@ -220,26 +238,6 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install clang (Ubuntu)
if: contains(matrix.runner_label, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install -y clang libclang-dev

- name: Install clang (macOS)
if: contains(matrix.runner_label, 'macos')
run: |
brew install llvm
brew link llvm
echo "LLVM_CONFIG_PATH=$(brew --prefix llvm)/bin/llvm-config" >> $GITHUB_ENV
echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" >> $GITHUB_ENV

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
target: wasm32-unknown-unknown
components: rust-src

- name: Test
env:
SVM_TARGET_PLATFORM: ${{ matrix.svm_target_platform }}
Expand Down
Loading
Loading