Skip to content

Commit d1061ed

Browse files
committed
Try to make Anchor 0.30.0 work first
1 parent 0782ce4 commit d1061ed

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

.github/workflows/main.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [main]
88

99
env:
10-
ANCHOR_VERSION: 0.31.0
10+
ANCHOR_VERSION: 0.30.0
1111
NODE_VERSION : 22
1212
SOLANA_VERSION: 2.1.9
1313
TOOLCHAIN: 1.81.0
@@ -39,7 +39,7 @@ jobs:
3939
project: ["counter-anchor", "counter-shank"]
4040
solana: ["1.18.18", "2.1.9"]
4141
include:
42-
- anchor: "0.31.0"
42+
- anchor: "0.30.0"
4343
project: "counter-anchor"
4444
solana: "2.1.9"
4545
- anchor: "0.30.0"
@@ -59,6 +59,19 @@ jobs:
5959
cache: "pnpm"
6060
- name: Install dependencies
6161
run: pnpm install --frozen-lockfile
62+
- name: Cache cargo crates
63+
uses: actions/cache@v4
64+
with:
65+
path: |
66+
~/.cargo/bin/
67+
~/.cargo/registry/index/
68+
~/.cargo/registry/cache/
69+
~/.cargo/git/db/
70+
./projects/**/.cargo/
71+
./projects/**/target/
72+
key: ${{ runner.os }}-crates-solana-v${{ matrix.solana }}-${{ hashFiles('projects/**/Cargo.lock') }}
73+
restore-keys: |
74+
${{ runner.os }}-crates-solana-v${{ matrix.solana }}
6275
- name: Install Solana
6376
uses: solana-program/actions/install-solana@v1
6477
with:
@@ -80,19 +93,6 @@ jobs:
8093
version: ${{ matrix.anchor }}
8194
- name: Pre-scaffold projects for caching purposes
8295
run: pnpm snapshot ${{ matrix.project }} --scaffold-only
83-
- name: Cache cargo crates
84-
uses: actions/cache@v4
85-
with:
86-
path: |
87-
~/.cargo/bin/
88-
~/.cargo/registry/index/
89-
~/.cargo/registry/cache/
90-
~/.cargo/git/db/
91-
./projects/**/.cargo/
92-
./projects/**/target/
93-
key: ${{ runner.os }}-crates-solana-v${{ matrix.solana }}-${{ hashFiles('projects/**/Cargo.lock') }}
94-
restore-keys: |
95-
${{ runner.os }}-crates-solana-v${{ matrix.solana }}
9696
- name: Build and run tests
9797
run: pnpm snapshot ${{ matrix.project }} --test
9898

@@ -118,16 +118,6 @@ jobs:
118118
cache: "pnpm"
119119
- name: Install Dependencies
120120
run: pnpm install --frozen-lockfile
121-
- name: Install Solana
122-
uses: solana-program/actions/install-solana@v1
123-
with:
124-
version: ${{ env.SOLANA_VERSION }}
125-
- name: Install Anchor
126-
uses: metaplex-foundation/actions/install-anchor-cli@v1
127-
with:
128-
version: ${{ env.ANCHOR_VERSION }}
129-
- name: Pre-scaffold projects for caching purposes
130-
run: pnpm snapshot --scaffold-only
131121
- name: Cache cargo crates
132122
uses: actions/cache@v4
133123
with:
@@ -141,6 +131,16 @@ jobs:
141131
key: ${{ runner.os }}-crates-solana-v${{ env.SOLANA_VERSION }}-${{ hashFiles('projects/**/Cargo.lock') }}
142132
restore-keys: |
143133
${{ runner.os }}-crates-solana-v${{ env.SOLANA_VERSION }}
134+
- name: Install Solana
135+
uses: solana-program/actions/install-solana@v1
136+
with:
137+
version: ${{ env.SOLANA_VERSION }}
138+
- name: Install Anchor
139+
uses: metaplex-foundation/actions/install-anchor-cli@v1
140+
with:
141+
version: ${{ env.ANCHOR_VERSION }}
142+
- name: Pre-scaffold projects for caching purposes
143+
run: pnpm snapshot --scaffold-only
144144
- name: Setup git user
145145
run: |
146146
git config --global user.email "github-actions[bot]@users.noreply.github.com"

utils/versionAnchor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
Version,
88
} from './versionCore';
99

10-
export const FALLBACK_ANCHOR_VERSION: Version = '0.31.0';
10+
export const FALLBACK_ANCHOR_VERSION: Version = '0.30.0';
1111

1212
export async function detectAnchorVersion(
1313
language: Language

0 commit comments

Comments
 (0)