Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f1fa5ee
feat: rm agent-js and bootstrap. nix pulls them from new repo
gobengo Aug 28, 2020
3a5e789
agent-js-monorepo uses napalm, but fails on lerna bootstrap (help me …
gobengo Aug 28, 2020
c59f973
Fix agent-js-monorepo.nix to properly npm install
gobengo Aug 28, 2020
c834a4f
fix nix
gobengo Aug 28, 2020
436a065
Adjust agent-js pkgs
gobengo Aug 28, 2020
f3aade5
update ref to agent-js-monorepo latest master
gobengo Aug 28, 2020
1183126
try re-enabling napalm buildPackage for agent-js-monorepo
gobengo Aug 28, 2020
0c4d7b1
chore: remove hacky nix trying to make napalm work with lerna. update…
gobengo Aug 31, 2020
124478d
bump nix/sources.json ref to agent-js
gobengo Sep 1, 2020
b603cd3
bump nix/sources.json ref to agent-js
gobengo Sep 1, 2020
9bc2689
build: niv advisory-db: update 47d12507 -> c341943a (#970)
dfinity-bot Aug 28, 2020
d450b16
fix: intermittent failure in dfx start (#968)
Aug 28, 2020
55dbd7b
chore: update replica to release-2020-08-26.RC00 (#959)
p-shahi Aug 29, 2020
d8bcbdd
INF-1483: Update niv-updater-action (#975)
nmattia Aug 31, 2020
34eedb0
build: niv motoko: update 7e436c2e -> 36478fa9 (#935)
dfinity-bot Aug 31, 2020
34ea215
build: niv common: update 01f876ed -> 2a0a8ef1 (#976)
dfinity-bot Aug 31, 2020
08db43e
chore: update install script to not warn on MacOS Big Sur (#969)
Aug 31, 2020
11aaafe
build: niv advisory-db: update c341943a -> 68e0e1f7 (#979)
dfinity-bot Sep 1, 2020
164490b
build: niv napalm: update 47e8d246 -> 3b687c6b (#980)
dfinity-bot Sep 1, 2020
8b0f2ff
reset assets.nix to master
gobengo Sep 1, 2020
3638424
fix: rm accidental file '71'
gobengo Sep 1, 2020
c10cdbf
fix: clean up nix/agent-js/agent-js-monorepo.nix
gobengo Sep 1, 2020
6da5db4
Merge branch 'master' of github.com:dfinity-lab/sdk into rm-agent-js
gobengo Sep 1, 2020
281ff1b
chore: update niv ref to agent-js-monorepo@e017c90eeb982536caf6e5341b…
gobengo Sep 1, 2020
0e7fc90
chore: update niv ref to agent-js-monorepo@e017c90eeb982536caf6e5341b…
gobengo Sep 1, 2020
68e0f3e
chore: rm src/{bootstrap,agent/javascript}
gobengo Sep 1, 2020
289bdb6
Merge branch 'master' of github.com:dfinity-lab/sdk into rm-agent-js
gobengo Sep 1, 2020
43137c6
chore: update niv ref to agent-js-monorepo@6da3e0a71a500965a901b01e13…
gobengo Sep 2, 2020
b0fcf5b
chore: add newline to end of README to force new commit
gobengo Sep 2, 2020
7c20d9f
fix: fix ci.nix by removing broken references to old agent-js
gobengo Sep 2, 2020
7765aa9
fix: fix e2e/node nix build after removing agent/bootstrap
gobengo Sep 2, 2020
afe9374
Merge branch 'master' of github.com:dfinity-lab/sdk into rm-agent-js
gobengo Sep 2, 2020
53a927d
Merge branch 'master' of github.com:dfinity-lab/sdk into rm-agent-js
gobengo Sep 8, 2020
2d6609b
rm e2e node. They will move to agent-js repo
gobengo Sep 8, 2020
2f11bb6
Add configureScript to agent-js-monorepo to fix npm trying to write t…
gobengo Sep 8, 2020
eb6c2cb
fmt nix/agent-js/\*.nix with nixfmt
gobengo Sep 8, 2020
e9ee18d
Merge branch 'master' of github.com:dfinity-lab/sdk into rm-agent-js
gobengo Sep 8, 2020
64eff05
Fix assets.bootstrap fs layout breaking frontend.bats test
gobengo Sep 9, 2020
841ac78
Merge branch 'master' of github.com:dfinity-lab/sdk into rm-agent-js
gobengo Sep 9, 2020
45fc2e8
update ref on agent-js-monorepo and make nixes pass
gobengo Sep 9, 2020
088fe36
agent-js-monorepo does npm install --ignore scripts once before regul…
gobengo Sep 9, 2020
fae073e
rm nix/agent-js/agent-js.nix, which is not used by anything (#1008)
gobengo Sep 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ make sure the installer actually downloads and installs the new DFX release the
job which will monitor the aforementioned `publish.install-sh.x86_64-linux`
job for new builds, whenever there's a new build it will download the output
(the CD script) and execute it.

4 changes: 2 additions & 2 deletions assets.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ pkgs ? import ./nix {}
, bootstrap-js ? import ./src/bootstrap { inherit pkgs; }
, bootstrap-js ? import ./nix/agent-js/bootstrap-js.nix { inherit pkgs; }
, distributed-canisters ? import ./distributed-canisters.nix { inherit pkgs; }
}:
pkgs.runCommandNoCCLocal "assets" {} ''
Expand All @@ -14,7 +14,7 @@ pkgs.runCommandNoCCLocal "assets" {} ''

# Install bootstrap
mkdir $out/bootstrap
cp -R ${bootstrap-js.out}/* $out/bootstrap/
cp -R ${bootstrap-js.dist}/* $out/bootstrap/

cp -R ${distributed-canisters} $out/canisters
''
8 changes: 3 additions & 5 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@
, labels ? {}
}:
rec {
dfx = import ./dfx.nix { inherit pkgs agent-js assets; };
dfx = import ./dfx.nix { inherit pkgs assets; };

e2e-tests = import ./e2e/bats { inherit pkgs dfx; };
e2e-tests-ic-ref = import ./e2e/bats { inherit pkgs dfx; use_ic_ref = true; };
node-e2e-tests = import ./e2e/node { inherit pkgs dfx; };

# Agents in varous languages
agent-js = import ./src/agent/javascript { inherit pkgs; };
agent-js-monorepo = pkgs.agent-js-monorepo;

# Bootstrap frontend.
bootstrap-js = import ./src/bootstrap { inherit pkgs agent-js; };
bootstrap-js = import ./nix/agent-js/bootstrap-js.nix { inherit system pkgs; };

cargo-audit = import ./cargo-audit.nix { inherit pkgs RustSec-advisory-db; };

Expand All @@ -34,7 +33,6 @@ rec {
# `shell.nix` in the root to provide an environment which is the composition
# of all the shells here.
shells = {
js-user-library = import ./src/agent/javascript/shell.nix { inherit pkgs agent-js; };
rust-workspace = dfx.shell;
};

Expand Down
1 change: 0 additions & 1 deletion dfx.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

{ pkgs ? import ./nix { inherit system; }
, system ? builtins.currentSystem
, agent-js ? import ./src/agent/javascript { inherit pkgs; }
, assets ? import ./assets.nix { inherit pkgs; }
}:
let
Expand Down
10 changes: 0 additions & 10 deletions e2e/node/.prettierrc

This file was deleted.

54 changes: 0 additions & 54 deletions e2e/node/README.adoc

This file was deleted.

11 changes: 0 additions & 11 deletions e2e/node/basic/call.ts

This file was deleted.

36 changes: 0 additions & 36 deletions e2e/node/default.nix

This file was deleted.

10 changes: 0 additions & 10 deletions e2e/node/identity/principal.ts

This file was deleted.

23 changes: 0 additions & 23 deletions e2e/node/jest.config.js

This file was deleted.

Loading