update versions (#1607)
This commit is contained in:
parent
170a763625
commit
f0a664c837
|
@ -8,7 +8,7 @@ on:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
env:
|
env:
|
||||||
SOLANA_CLI_VERSION: 1.8.5
|
SOLANA_CLI_VERSION: 1.8.14
|
||||||
NODE_VERSION: 17.0.1
|
NODE_VERSION: 17.0.1
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -92,31 +92,31 @@ jobs:
|
||||||
id: cache-basic-0
|
id: cache-basic-0
|
||||||
with:
|
with:
|
||||||
path: ./examples/tutorial/basic-0/target
|
path: ./examples/tutorial/basic-0/target
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-0/**/Cargo.toml') }}
|
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-0/**/Cargo.toml') }}-${{ env.SOLANA_CLI_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
|
||||||
- uses: actions/cache@v2
|
- uses: actions/cache@v2
|
||||||
name: basic-1 cache
|
name: basic-1 cache
|
||||||
id: cache-basic-1
|
id: cache-basic-1
|
||||||
with:
|
with:
|
||||||
path: ./examples/tutorial/basic-1/target
|
path: ./examples/tutorial/basic-1/target
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-1/**/Cargo.toml') }}
|
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-1/**/Cargo.toml') }}-${{ env.SOLANA_CLI_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
|
||||||
- uses: actions/cache@v2
|
- uses: actions/cache@v2
|
||||||
name: basic-2 cache
|
name: basic-2 cache
|
||||||
id: cache-basic-2
|
id: cache-basic-2
|
||||||
with:
|
with:
|
||||||
path: ./examples/tutorial/basic-2/target
|
path: ./examples/tutorial/basic-2/target
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-2/**/Cargo.toml') }}
|
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-2/**/Cargo.toml') }}-${{ env.SOLANA_CLI_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
|
||||||
- uses: actions/cache@v2
|
- uses: actions/cache@v2
|
||||||
name: basic-3 cache
|
name: basic-3 cache
|
||||||
id: cache-basic-3
|
id: cache-basic-3
|
||||||
with:
|
with:
|
||||||
path: ./examples/tutorial/basic-3/target
|
path: ./examples/tutorial/basic-3/target
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-3/**/Cargo.toml') }}
|
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-3/**/Cargo.toml') }}-${{ env.SOLANA_CLI_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
|
||||||
- uses: actions/cache@v2
|
- uses: actions/cache@v2
|
||||||
name: basic-4 cache
|
name: basic-4 cache
|
||||||
id: cache-basic-4
|
id: cache-basic-4
|
||||||
with:
|
with:
|
||||||
path: ./examples/tutorial/basic-4/target
|
path: ./examples/tutorial/basic-4/target
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-4/**/Cargo.toml') }}
|
key: cargo-${{ runner.os }}-${{ hashFiles('./examples/tutorial/basic-4/**/Cargo.toml') }}-${{ env.SOLANA_CLI_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
|
||||||
- run: cd examples/tutorial && yarn workspaces run test
|
- run: cd examples/tutorial && yarn workspaces run test
|
||||||
|
|
||||||
setup-client-example:
|
setup-client-example:
|
||||||
|
@ -187,7 +187,7 @@ jobs:
|
||||||
id: cache-test-target
|
id: cache-test-target
|
||||||
with:
|
with:
|
||||||
path: client/example/target
|
path: client/example/target
|
||||||
key: cargo-${{ runner.os }}-client/example-${{ env.ANCHOR_VERSION }}
|
key: cargo-${{ runner.os }}-client/example-${{ env.ANCHOR_VERSION }}-${{ env.SOLANA_CLI_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
|
||||||
- uses: ./.github/actions/setup-solana/
|
- uses: ./.github/actions/setup-solana/
|
||||||
- run: cd client/example && ./run-test.sh
|
- run: cd client/example && ./run-test.sh
|
||||||
|
|
||||||
|
@ -224,7 +224,7 @@ jobs:
|
||||||
id: cache-test-target
|
id: cache-test-target
|
||||||
with:
|
with:
|
||||||
path: tests/bpf-upgradeable-state/target
|
path: tests/bpf-upgradeable-state/target
|
||||||
key: cargo-${{ runner.os }}-tests/bpf-upgradeable-state-${{ env.ANCHOR_VERSION }}
|
key: cargo-${{ runner.os }}-tests/bpf-upgradeable-state-${{ env.ANCHOR_VERSION }}-${{ env.SOLANA_CLI_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
- run: solana-test-validator -r --quiet &
|
- run: solana-test-validator -r --quiet &
|
||||||
name: start validator
|
name: start validator
|
||||||
|
@ -349,7 +349,7 @@ jobs:
|
||||||
id: cache-test-target
|
id: cache-test-target
|
||||||
with:
|
with:
|
||||||
path: ${{ matrix.node.path }}/target
|
path: ${{ matrix.node.path }}/target
|
||||||
key: cargo-${{ runner.os }}-${{ matrix.node.path }}-${{ env.ANCHOR_VERSION }}
|
key: cargo-${{ runner.os }}-${{ matrix.node.path }}-${{ env.ANCHOR_VERSION }}-${{ env.SOLANA_CLI_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
- run: ${{ matrix.node.cmd }}
|
- run: ${{ matrix.node.cmd }}
|
||||||
name: ${{ matrix.node.path }} program test
|
name: ${{ matrix.node.path }} program test
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -25,10 +25,10 @@ shellexpand = "2.1.0"
|
||||||
toml = "0.5.8"
|
toml = "0.5.8"
|
||||||
semver = "1.0.4"
|
semver = "1.0.4"
|
||||||
serde = { version = "1.0.122", features = ["derive"] }
|
serde = { version = "1.0.122", features = ["derive"] }
|
||||||
solana-sdk = "1.8.5"
|
solana-sdk = "~1.8.14"
|
||||||
solana-program = "1.8.5"
|
solana-program = "~1.8.14"
|
||||||
solana-client = "1.8.5"
|
solana-client = "~1.8.14"
|
||||||
solana-cli-config = "1.8.5"
|
solana-cli-config = "~1.8.14"
|
||||||
serum-common = { git = "https://github.com/project-serum/serum-dex", features = ["client"] }
|
serum-common = { git = "https://github.com/project-serum/serum-dex", features = ["client"] }
|
||||||
dirs = "3.0"
|
dirs = "3.0"
|
||||||
heck = "0.3.1"
|
heck = "0.3.1"
|
||||||
|
|
|
@ -6,7 +6,7 @@ ANCHOR_CLI=v$(shell awk -F ' = ' '$$1 ~ /version/ { gsub(/[\"]/, "", $$2); print
|
||||||
#
|
#
|
||||||
# Solana toolchain.
|
# Solana toolchain.
|
||||||
#
|
#
|
||||||
SOLANA_CLI=v1.8.5
|
SOLANA_CLI=v1.8.14
|
||||||
#
|
#
|
||||||
# Build version should match the Anchor cli version.
|
# Build version should match the Anchor cli version.
|
||||||
#
|
#
|
||||||
|
|
|
@ -39,6 +39,6 @@ arrayref = "0.3.6"
|
||||||
base64 = "0.13.0"
|
base64 = "0.13.0"
|
||||||
borsh = "0.9"
|
borsh = "0.9"
|
||||||
bytemuck = "1.4.0"
|
bytemuck = "1.4.0"
|
||||||
solana-program = "1.8.5"
|
solana-program = "~1.8.14"
|
||||||
thiserror = "1.0.20"
|
thiserror = "1.0.20"
|
||||||
bincode = "1.3.3"
|
bincode = "1.3.3"
|
||||||
|
|
|
@ -20,6 +20,6 @@ dex = ["serum_dex"]
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anchor-lang = { path = "../lang", version = "0.22.1", features = ["derive"] }
|
anchor-lang = { path = "../lang", version = "0.22.1", features = ["derive"] }
|
||||||
serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
|
serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
|
||||||
solana-program = "1.8.5"
|
solana-program = "~1.8.14"
|
||||||
spl-token = { version = "3.1.1", features = ["no-entrypoint"], optional = true }
|
spl-token = { version = "3.1.1", features = ["no-entrypoint"], optional = true }
|
||||||
spl-associated-token-account = { version = "1.0.3", features = ["no-entrypoint"], optional = true }
|
spl-associated-token-account = { version = "1.0.3", features = ["no-entrypoint"], optional = true }
|
||||||
|
|
Loading…
Reference in New Issue