Skip to content

Commit

Permalink
Upgrade to Solana v1.9.12 (#152)
Browse files Browse the repository at this point in the history
* Upgrade to Solana v1.9.12

* udev
  • Loading branch information
macalinao committed Mar 15, 2022
1 parent 0476964 commit 5e87905
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN: "1.58.1"
RUST_TOOLCHAIN: "1.59.0"

jobs:
doc:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN: "1.58.1"
RUST_TOOLCHAIN: "1.59.0"

jobs:
lint:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/program.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:

env:
CARGO_TERM_COLOR: always
SOLANA_VERSION: "1.8.14"
RUST_TOOLCHAIN: "1.58.1"
SOLANA_VERSION: "1.9.12"
RUST_TOOLCHAIN: "1.59.0"

jobs:
unit-tests:
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN: nightly-2021-12-09
RUST_TOOLCHAIN: "1.59.0"

jobs:
release-crate:
Expand All @@ -17,11 +17,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v16
with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"
extra_nix_config: |
experimental-features = nix-command flakes
- name: Setup Cachix
uses: cachix/cachix-action@v10
with:
Expand All @@ -43,11 +38,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v16
with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"
extra_nix_config: |
experimental-features = nix-command flakes
- name: Setup Cachix
uses: cachix/cachix-action@v10
with:
Expand Down
4 changes: 2 additions & 2 deletions Anchor.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
anchor_version = "0.22.0"
solana_version = "1.8.14"
anchor_version = "0.22.1"
solana_version = "1.9.12"

[workspace]
members = [
Expand Down
45 changes: 16 additions & 29 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
ci = pkgs.buildEnv {
name = "ci";
paths = with pkgs;
(pkgs.lib.optionals pkgs.stdenv.isLinux ([ libudev ])) ++ [
(pkgs.lib.optionals pkgs.stdenv.isLinux ([ udev ])) ++ [
anchor-0_22_0
cargo-workspaces
cargo-fuzz
Expand Down
2 changes: 1 addition & 1 deletion stable-swap-program/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ _We recommend using the included Nix flake to develop within this repo._
Download or update the Solana SDK by running:

```bash
solana-install init 1.8.11
solana-install init 1.9.12
```

To build the program, run:
Expand Down

0 comments on commit 5e87905

Please sign in to comment.