Skip to content

Commit a52b113

Browse files
committed
Merge branch 'native2.1' into native-bump-version
2 parents cf49e53 + b74293a commit a52b113

File tree

29 files changed

+385
-631
lines changed

29 files changed

+385
-631
lines changed

.github/workflows/solana-native.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,26 +179,27 @@ jobs:
179179
180180
# Install pnpm
181181
npm install --global pnpm
182-
- name: Setup Solana stable
182+
- name: Setup Solana Beta
183183
uses: heyAyushh/[email protected]
184184
with:
185-
solana-cli-version: stable
186-
- name: Build and Test with Stable
185+
solana-cli-version: beta
186+
- name: Build and Test with Beta
187187
run: |
188188
source build_and_test.sh
189189
solana -V
190190
rustc -V
191-
process_projects "stable"
192-
- name: Setup Solana 2.0.0
193-
uses: heyAyushh/setup-solana@v5.9
191+
process_projects "beta"
192+
- name: Setup Solana Stable
193+
uses: heyAyushh/setup-solana@v5.5
194194
with:
195-
solana-cli-version: 2.0.0
196-
- name: Build and Test with 2.0.0
195+
solana-cli-version: stable
196+
- name: Build and Test with Stable
197+
continue-on-error: true
197198
run: |
198199
source build_and_test.sh
199200
solana -V
200201
rustc -V
201-
process_projects "2.0.0"
202+
process_projects "stable"
202203
203204
- name: Set failed projects output
204205
id: set-failed

.github/workflows/steel.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ jobs:
252252
# Make the script executable
253253
chmod +x build_and_test.sh
254254
255-
- name: Setup Solana stable
255+
- name: Setup Solana Beta
256256
uses: heyAyushh/[email protected]
257257
with:
258-
solana-cli-version: stable
259-
- name: Build and Test with Stable
258+
solana-cli-version: beta
259+
- name: Build and Test with Beta
260260
env:
261261
SCCACHE_GHA_ENABLED: "true"
262262
RUSTC_WRAPPER: "sccache"
@@ -265,13 +265,13 @@ jobs:
265265
solana -V
266266
rustc -V
267267
solana-keygen new --no-bip39-passphrase
268-
process_projects "stable"
268+
process_projects "beta"
269269
sccache --show-stats
270-
- name: Setup Solana 1.18.17
270+
- name: Setup Solana Stable
271271
uses: heyAyushh/[email protected]
272272
with:
273-
solana-cli-version: 1.18.17
274-
- name: Build and Test with 1.18.17
273+
solana-cli-version: stable
274+
- name: Build and Test with Stable
275275
env:
276276
SCCACHE_GHA_ENABLED: "true"
277277
RUSTC_WRAPPER: "sccache"
@@ -280,7 +280,7 @@ jobs:
280280
solana -V
281281
rustc -V
282282
solana-keygen new --no-bip39-passphrase --force
283-
process_projects "1.18.17"
283+
process_projects "stable"
284284
sccache --show-stats
285285
286286
- name: Set failed projects output

0 commit comments

Comments
 (0)