ci: Separate twoxtx build step, match Rust version (#3422)

* ci: Separate twoxtx build step, match Rust version

* Make a change to trigger CI

* Really trigger CI this time

* Fixup yaml issue

* Also set RUST_STABLE_VERSION

* Define env variable earlier

Author: joncinque

.github/workflows/pull-request-token.yml

@@ -6,12 +6,14 @@ on:
     - 'associated-token-account/**'
     - 'token/**'
     - 'ci/*-version.sh'
+    - '.github/workflows/pull-request-token.yml'
   push:
     branches: [master]
     paths:
     - 'associated-token-account/**'
     - 'token/**'
     - 'ci/*-version.sh'
+    - '.github/workflows/pull-request-token.yml'
 
 jobs:
   cargo-test-bpf:
@@ -62,11 +64,6 @@ jobs:
       - name: Build and test ATA
         run: ./ci/cargo-test-bpf.sh associated-token-account
 
-      - name: Build and test token-2022 twoxtx (TEMPORARY)
-        run: |
-          ./token/twoxtx-setup.sh
-          ./ci/cargo-test-bpf.sh token/program-2022-test
-
       - name: Build and test token-2022 with "serde" activated
         run: |
           cargo +"${{ env.RUST_STABLE }}" test \
@@ -82,6 +79,43 @@ jobs:
           path: "target/deploy/*.so"
           if-no-files-found: error
 
+  cargo-test-bpf-twoxtx:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set env vars
+        run: |
+          echo "RUST_STABLE_VERSION=1.60.0" >> $GITHUB_ENV
+          source ci/rust-version.sh
+          echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
+          source ci/solana-version.sh
+          echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_STABLE }}
+          override: true
+          profile: minimal
+
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+          key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}}
+
+      - name: Install dependencies
+        run: |
+          ./ci/install-build-deps.sh
+          ./ci/install-program-deps.sh
+          echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
+
+      - name: Build and test token-2022 twoxtx (TEMPORARY)
+        run: |
+          ./token/twoxtx-setup.sh
+          ./ci/cargo-test-bpf.sh token/program-2022-test
+
   js-test:
     runs-on: ubuntu-latest
     env:

token/twoxtx-setup.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Patch in a Solana v1.10 monorepo that supports 2x transactions for testing the
+# Patch in a Solana v1.11 monorepo that supports 2x transactions for testing the
 # SPL Token 2022 Confidential Transfer extension
 #