use same rust as what solana uses, use same solana version as cargo toml

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
microwavedcola1 2022-05-23 21:46:18 +02:00 committed by Christian Kamm
parent f844720130
commit 9145746ac0
3 changed files with 13 additions and 23 deletions

View File

@ -27,9 +27,6 @@ show_tree = true # Show inverse dependency trees along with advisories (default:
# arch = "x86_64" # Ignore advisories for CPU architectures other than this one # arch = "x86_64" # Ignore advisories for CPU architectures other than this one
# os = "linux" # Ignore advisories for operating systems other than this one # os = "linux" # Ignore advisories for operating systems other than this one
[packages]
source = "all" # "all", "public" or "local"
[yanked] [yanked]
enabled = false # Warn for yanked crates in Cargo.lock (default: true) enabled = false # Warn for yanked crates in Cargo.lock (default: true)
update_index = true # Auto-update the crates.io index (default: true) update_index = true # Auto-update the crates.io index (default: true)

View File

@ -9,8 +9,8 @@ on:
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
SOLANA_VERSION: "1.9.5" SOLANA_VERSION: "1.9.14"
RUST_TOOLCHAIN: stable RUST_TOOLCHAIN: 1.60.0
LOG_PROGRAM: "m43thNJ58XCjL798ZSq6JGAG1BnWskhdq5or6kcnfsD" LOG_PROGRAM: "m43thNJ58XCjL798ZSq6JGAG1BnWskhdq5or6kcnfsD"
defaults: defaults:
@ -21,13 +21,13 @@ jobs:
lint: lint:
name: Lint name: Lint
if: github.actor != 'github-actions[bot]' if: github.actor != 'github-actions[bot]'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install Linux dependencies - name: Install Linux dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config build-essential libudev-dev run: sudo apt-get update && sudo apt-get install -y pkg-config build-essential libudev-dev
- name: Install Rust nightly - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
override: true override: true
@ -50,19 +50,12 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install Linux dependencies - name: Install Linux dependencies
run: sudo apt-get update && sudo apt-get install -y pkg-config build-essential libudev-dev run: sudo apt-get update && sudo apt-get install -y pkg-config build-essential libudev-dev
- name: Install Rust nightly - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
override: true override: true
profile: minimal profile: minimal
toolchain: ${{ env.RUST_TOOLCHAIN }} toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Cache dependencies
uses: Swatinem/rust-cache@v1
- name: Cache Solana binaries
uses: actions/cache@v2
with:
path: ~/.cache/solana
key: ${{ runner.os }}-${{ env.SOLANA_VERSION }}
- name: Install Solana - name: Install Solana
run: | run: |
sh -c "$(curl -sSfL https://release.solana.com/v${{ env.SOLANA_VERSION }}/install)" sh -c "$(curl -sSfL https://release.solana.com/v${{ env.SOLANA_VERSION }}/install)"
@ -82,7 +75,7 @@ jobs:
name: raw-test-bpf name: raw-test-bpf
path: raw-test-bpf.log path: raw-test-bpf.log
# Download logs and process them # Download logs and process them
process-logs: process-logs:
name: Process logs name: Process logs
if: github.actor != 'github-actions[bot]' if: github.actor != 'github-actions[bot]'
@ -118,7 +111,7 @@ jobs:
with: with:
name: cu-per-ix-clean name: cu-per-ix-clean
path: cu-per-ix-clean.log path: cu-per-ix-clean.log
# Push clean logs to git if main/dev branch # Push clean logs to git if main/dev branch
push-logs: push-logs:
name: Push logs name: Push logs

View File

@ -2,15 +2,15 @@ name: Soteria Scan
on: on:
push: push:
branches: branches:
- main - main
- dev - dev
pull_request: pull_request:
workflow_dispatch: #pick branch to manually run on workflow_dispatch: #pick branch to manually run on
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
SOLANA_VERSION: "1.9.5" SOLANA_VERSION: "1.9.14"
jobs: jobs:
build: build:
@ -20,10 +20,10 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
program: [ 'programs/mango-v4', 'programs/margin-trade' ] program: ["programs/mango-v4", "programs/margin-trade"]
env: env:
PROGRAM_PATH: ${{ matrix.program }} PROGRAM_PATH: ${{ matrix.program }}
steps: steps:
- name: Check-out repo - name: Check-out repo
uses: actions/checkout@v2 uses: actions/checkout@v2