Merge branch 'master' into jl/update_snapshot_dirs

jito-foundation · Jan 3, 2024 · 145648a · 145648a
2 parents 6f04470 + 28520ea
commit 145648a
Show file tree

Hide file tree

Showing 23 changed files with 1,435 additions and 809 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,7 +7,7 @@ on:
     branches:
       - master
 env:
-  SOLANA_CLI_VERSION: 1.14.17
+  SOLANA_CLI_VERSION: 1.16.16
 jobs:
   build-and-test:
     name: Build and test programs
@@ -29,14 +29,19 @@ jobs:
             ~/.cargo/git/db/
             ./mev-programs/target/
           key: cargo-${{ runner.os }}-anchor-${{ hashFiles('**/Cargo.lock') }}
-      - run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.27.0 anchor-cli --locked --force
+      - run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.28.0 anchor-cli --locked --force
       - name: Install yarn dependencies
         working-directory: ./mev-programs
         run: yarn
-      - uses: reinismu/clippy-check@master
+      - name: Install latest nightly
+        uses: actions-rs/toolchain@v1
         with:
-          working-directory: ./mev-programs/programs
-          token: ${{ secrets.GITHUB_TOKEN }}
+          toolchain: nightly-2023-04-19-x86_64-unknown-linux-gnu
+          components: rustfmt, clippy
+      - name: clippy
+        working-directory: ./mev-programs
+        run: cargo +nightly-2023-04-19 clippy
+        shell: bash
 
       # Build IDLs
       - name: Build jito_tip_distribution
@@ -83,14 +88,3 @@ jobs:
             mev-programs/target/deploy/jito_tip_payment.so
             mev-programs/target/idl/jito_tip_distribution.json
             mev-programs/target/idl/jito_tip_payment.json
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          working-directory: ./mev-programs
-          files: |
-            mev-programs/target/deploy/jito_tip_distribution.so
-            mev-programs/target/deploy/jito_tip_payment.so
-            mev-programs/target/idl/jito_tip_distribution.json
-            mev-programs/target/idl/jito_tip_payment.json
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,7 +5,7 @@ on:
       - 'v*'
 
 env:
-  SOLANA_CLI_VERSION: 1.14.17
+  SOLANA_CLI_VERSION: 1.16.17
 jobs:
   release:
     name: Create the jito programs release
@@ -27,12 +27,12 @@ jobs:
             ~/.cargo/git/db/
             ./mev-programs/target/
           key: cargo-${{ runner.os }}-anchor-${{ hashFiles('**/Cargo.lock') }}
-      - run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.27.0 anchor-cli --locked --force
+      - run: cargo install --git https://github.com/coral-xyz/anchor --tag v0.28.0 anchor-cli --locked --force
       - name: Install yarn dependencies
         working-directory: ./mev-programs
         run: yarn
 
-      # Build IDLs
+      # Build IDLs + programs
       - name: Build jito_tip_distribution
         working-directory: ./mev-programs
         run: anchor build --idl idl --program-name jito_tip_distribution

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4.0
-FROM rust:1.66.0-slim-bullseye as builder
+FROM rust:1.72.1-slim-bullseye as builder
 
 RUN set -x \
     && apt-get -qq update \
@@ -13,11 +13,11 @@ RUN set -x \
     zlib1g-dev \
     curl
 
-RUN sh -c "$(curl -sSfL https://release.solana.com/v1.14.17/install)"
+RUN sh -c "$(curl -sSfL https://release.solana.com/v1.16.17/install)"
 
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
 
-RUN cargo install --git https://github.com/coral-xyz/anchor --tag v0.27.0 anchor-cli --locked
+RUN cargo install --git https://github.com/coral-xyz/anchor --tag v0.28.0 anchor-cli --locked
 
 WORKDIR /jito-programs
 COPY . .