Skip to content

Commit 69257ee

Browse files
committed
Fix build
1 parent cca02cb commit 69257ee

File tree

8 files changed

+220
-701
lines changed

8 files changed

+220
-701
lines changed

.github/workflows/programs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
- name: Setup Cachix
4040
uses: cachix/cachix-action@v10
4141
with:
42-
name: saber
42+
name: deploydao
43+
extraPullNames: saber
4344
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
4445

4546
# Install Solana

.github/workflows/release.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
- name: Setup Cachix
2929
uses: cachix/cachix-action@v10
3030
with:
31-
name: saber
31+
name: deploydao
32+
extraPullNames: saber
3233
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
3334

3435
- name: Setup Node
@@ -71,7 +72,8 @@ jobs:
7172
- name: Setup Cachix
7273
uses: cachix/cachix-action@v10
7374
with:
74-
name: saber
75+
name: deploydao
76+
extraPullNames: saber
7577
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
7678

7779
- name: Build programs
@@ -89,19 +91,6 @@ jobs:
8991
name: Release crate on crates.io
9092
steps:
9193
- uses: actions/checkout@v2
92-
93-
- uses: cachix/install-nix-action@v14
94-
with:
95-
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
96-
install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"
97-
extra_nix_config: |
98-
experimental-features = nix-command flakes
99-
- name: Setup Cachix
100-
uses: cachix/cachix-action@v10
101-
with:
102-
name: saber
103-
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
104-
10594
- name: Install Rust nightly
10695
uses: actions-rs/toolchain@v1
10796
with:

LICENSE

Lines changed: 201 additions & 674 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"type": "git",
1616
"url": "git+https://github.com/deploydao/migrator.git"
1717
},
18-
"author": "Saber Team <team@saber.so>",
19-
"homepage": "https://saber.so",
20-
"license": "GPL-3.0",
18+
"author": "Deploy DAO <team@deploydao.com>",
19+
"homepage": "https://deploydao.com",
20+
"license": "Apache-2.0",
2121
"publishConfig": {
2222
"access": "public"
2323
},
@@ -65,7 +65,6 @@
6565
"idl:generate:nolint": "./scripts/idl.sh && RUN_ESLINT=none ./scripts/generate-idl-types.sh"
6666
},
6767
"dependencies": {
68-
"js-sha3": "^0.8.0",
6968
"tiny-invariant": "^1.1.0",
7069
"tslib": "^2.3.1"
7170
},

programs/migrator/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name = "migrator"
33
version = "0.1.0"
44
description = "A Solana program for deploying and upgrading programs."
55
edition = "2018"
6-
homepage = "https://saber.so"
6+
homepage = "https://deploydao.com"
77
repository = "https://github.com/DeployDAO/migrator"
88
license = "Apache-2.0"
9-
keywords = ["solana", "deploy", "token"]
9+
keywords = ["solana", "deploy", "anchor"]
1010

1111
[lib]
1212
crate-type = ["cdylib", "lib"]

shell.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@ in pkgs.mkShell {
3030
gnused
3131

3232
libiconv
33+
34+
anchor
35+
spl-token-cli
3336
] ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [
3437
pkgs.darwin.apple_sdk.frameworks.AppKit
3538
pkgs.darwin.apple_sdk.frameworks.IOKit
3639
pkgs.darwin.apple_sdk.frameworks.Foundation
37-
]) ++ (pkgs.lib.optionals (pkgs.stdenv.isLinux || pkgs.stdenv.isAarch64) [
38-
# for some reason these two only work on m1 macs
39-
anchor
40-
spl-token-cli
4140
]);
4241
shellHook = ''
4342
export PATH=$PATH:$HOME/.cargo/bin

tests/migrator.spec.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
describe("Migrator", () => {
2+
it("works", () => {
3+
// pass
4+
});
5+
});

yarn.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ __metadata:
9292
eslint-import-resolver-node: ^0.3.6
9393
eslint-plugin-import: ^2.24.2
9494
husky: ^7.0.2
95-
js-sha3: ^0.8.0
9695
lint-staged: ^11.2.0
9796
mocha: ^9.1.2
9897
prettier: ^2.4.1

0 commit comments

Comments
 (0)