Skip to content

Commit fb4d958

Browse files
committed
Merge branch 'master' into ak/auto_registration
2 parents 7823343 + ccdddf4 commit fb4d958

File tree

34 files changed

+4294
-3017
lines changed

34 files changed

+4294
-3017
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4
21-
with:
22-
submodules: recursive
2321
- name: Install cargo-audit from crates.io
2422
uses: baptiste0928/cargo-install@v3
2523
with:
@@ -32,8 +30,6 @@ jobs:
3230
runs-on: ubuntu-latest
3331
steps:
3432
- uses: actions/checkout@v4
35-
with:
36-
submodules: recursive
3733
- uses: actions-rust-lang/setup-rust-toolchain@v1
3834
with:
3935
components: rustfmt, clippy
@@ -74,16 +70,14 @@ jobs:
7470
runs-on: ubuntu-latest
7571
steps:
7672
- uses: actions/checkout@v4
77-
with:
78-
submodules: recursive
7973
- name: Install Protobuf Compiler
8074
run: |
8175
sudo apt-get update
82-
sudo apt-get install -y protobuf-compiler libudev-dev
76+
sudo apt-get install -y protobuf-compiler libudev-dev llvm-dev clang libclang-dev
8377
- uses: actions-rust-lang/setup-rust-toolchain@v1
8478
with:
8579
components: rustfmt, clippy
86-
toolchain: 1.84.1
80+
toolchain: 1.86.0
8781
- name: Install cargo-sort from crates.io
8882
uses: baptiste0928/cargo-install@v3
8983
with:
@@ -119,8 +113,6 @@ jobs:
119113
- name: add to path
120114
run: echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
121115
# TODO: remove
122-
- name: Init git submodules
123-
run: git submodule update --init --recursive
124116
- name: Building programs
125117
run: cargo-build-sbf
126118
env:
@@ -138,8 +130,8 @@ jobs:
138130
runs-on: big-runner-1
139131
steps:
140132
- uses: actions/checkout@v4
141-
with:
142-
submodules: recursive
133+
- name: Install system dependencies
134+
run: sudo apt-get update && sudo apt-get install -y libudev-dev
143135
- run: docker pull --platform linux/amd64 solanafoundation/solana-verifiable-build:2.2.14
144136
- uses: actions-rust-lang/setup-rust-toolchain@v1
145137
- name: Install solana-verify from crates.io
@@ -190,16 +182,14 @@ jobs:
190182
- name: Install Protobuf Compiler
191183
run: |
192184
sudo apt-get update
193-
sudo apt-get install -y protobuf-compiler libudev-dev
185+
sudo apt-get install -y protobuf-compiler libudev-dev llvm-dev clang libclang-dev
194186
- uses: actions-rust-lang/setup-rust-toolchain@v1
195187
- name: Download MEV Tip Distribution NCN program
196188
uses: actions/download-artifact@v4
197189
with:
198190
name: jito_tip_router_program.so
199191
path: ${{ github.workspace }}/integration_tests/tests/fixtures/
200192
if-no-files-found: error
201-
- name: Init git submodules
202-
run: git submodule update --init --recursive
203193
- uses: taiki-e/install-action@nextest
204194
- run: cargo nextest run --all-features -E 'not test(ledger_utils::tests)'
205195
env:

.gitmodules

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)