From 9145746ac08dfbb5bdd9a678cbbad8d4773c211a Mon Sep 17 00:00:00 2001
From: microwavedcola1 <microwavedcola@gmail.com>
Date: Mon, 23 May 2022 21:46:18 +0200
Subject: [PATCH] use same rust as what solana uses, use same solana version as
 cargo toml

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
---
 .cargo/audit.toml                  |  3 ---
 .github/workflows/ci-lint-test.yml | 21 +++++++--------------
 .github/workflows/ci-soteria.yml   | 12 ++++++------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.cargo/audit.toml b/.cargo/audit.toml
index 8dbd2cc87..ba098212b 100644
--- a/.cargo/audit.toml
+++ b/.cargo/audit.toml
@@ -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
 # os = "linux" # Ignore advisories for operating systems other than this one
 
-[packages]
-source = "all" # "all", "public" or "local"
-
 [yanked]
 enabled = false # Warn for yanked crates in Cargo.lock (default: true)
 update_index = true # Auto-update the crates.io index (default: true)
diff --git a/.github/workflows/ci-lint-test.yml b/.github/workflows/ci-lint-test.yml
index dcadff5eb..0c5688936 100644
--- a/.github/workflows/ci-lint-test.yml
+++ b/.github/workflows/ci-lint-test.yml
@@ -9,8 +9,8 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  SOLANA_VERSION: "1.9.5"
-  RUST_TOOLCHAIN: stable
+  SOLANA_VERSION: "1.9.14"
+  RUST_TOOLCHAIN: 1.60.0
   LOG_PROGRAM: "m43thNJ58XCjL798ZSq6JGAG1BnWskhdq5or6kcnfsD"
 
 defaults:
@@ -21,13 +21,13 @@ jobs:
   lint:
     name: Lint
     if: github.actor != 'github-actions[bot]'
-    runs-on: ubuntu-latest  
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Linux dependencies
         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
         with:
           override: true
@@ -50,19 +50,12 @@ jobs:
         uses: actions/checkout@v2
       - name: Install Linux dependencies
         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
         with:
           override: true
           profile: minimal
           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
         run: |
           sh -c "$(curl -sSfL https://release.solana.com/v${{ env.SOLANA_VERSION }}/install)"
@@ -82,7 +75,7 @@ jobs:
           name: raw-test-bpf
           path: raw-test-bpf.log
 
-# Download logs and process them
+  # Download logs and process them
   process-logs:
     name: Process logs
     if: github.actor != 'github-actions[bot]'
@@ -118,7 +111,7 @@ jobs:
         with:
           name: cu-per-ix-clean
           path: cu-per-ix-clean.log
-  
+
   # Push clean logs to git if main/dev branch
   push-logs:
     name: Push logs
diff --git a/.github/workflows/ci-soteria.yml b/.github/workflows/ci-soteria.yml
index ef6fb418e..be7590295 100644
--- a/.github/workflows/ci-soteria.yml
+++ b/.github/workflows/ci-soteria.yml
@@ -2,15 +2,15 @@ name: Soteria Scan
 
 on:
   push:
-    branches: 
-     - main
-     - dev
+    branches:
+      - main
+      - dev
   pull_request:
   workflow_dispatch: #pick branch to manually run on
 
 env:
   CARGO_TERM_COLOR: always
-  SOLANA_VERSION: "1.9.5"
+  SOLANA_VERSION: "1.9.14"
 
 jobs:
   build:
@@ -20,10 +20,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        program: [ 'programs/mango-v4', 'programs/margin-trade' ]
+        program: ["programs/mango-v4", "programs/margin-trade"]
     env:
       PROGRAM_PATH: ${{ matrix.program }}
-      
+
     steps:
       - name: Check-out repo
         uses: actions/checkout@v2