Skip to content

Commit

Permalink
chore: upgrade sdk and docker for next versions
Browse files Browse the repository at this point in the history
  • Loading branch information
thepiwo committed Apr 23, 2024
1 parent 77f7506 commit 63b0fb2
Show file tree
Hide file tree
Showing 10 changed files with 243 additions and 312 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
matrix:
node-version: [16, 18, 20, 21]
node-tag: [latest]
compiler-tag: [v7.6.1] # latest is v8.0.0-rc1 which is not supported by the sdk currently
compiler-tag: [latest]
aux-ci-run: [true]

# for lts node also test first known compatible and latest known good compiler and node versions
Expand Down
1 change: 1 addition & 0 deletions docs/cli/env.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ aeproject env --info
- aeproject uses the `-bundle` node docker images including dev mode, which are only published from `NODE_TAG >= v6.3.0`
- the default `aeternity.yaml` config file that ships with aeproject supports `NODE_TAG >= v6.8.0`
- the latest `@aeternity/aepp-sdk@13` is only compatible using `NODE_TAG >= v6.0.0` and `COMPILER_TAG >= v7.5.0`
- the sdk from `@aeternity/aepp-sdk@13 >= v13.3.2` is compatible with `NODE_TAG >= v7.0.0-rc1` and `COMPILER_TAG >= v8.0.0-rc1`
- ARM64/Apple Silicon is supported from images `NODE_TAG >= v6.8.1` and `COMPILER_TAG >= v7.3.0`

## Disclaimer
Expand Down
462 changes: 223 additions & 239 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,21 @@
"node": ">=16.0.0"
},
"dependencies": {
"@aeternity/aepp-sdk": "^13.2.2",
"commander": "^11.0.0",
"@aeternity/aepp-sdk": "^13.3.2",
"commander": "^12.0.0",
"promisify-child-process": "^4.1.2",
"prompts": "^2.4.2"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@typescript-eslint/eslint-plugin": "^7.7.1",
"@typescript-eslint/parser": "^7.7.1",
"chai": "^4.4.1",
"chai-files": "^1.4.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"mocha": "^10.3.0",
"mocha": "^10.4.0",
"prettier": "^3.2.5",
"typescript": "^5.3.3"
"typescript": "^5.4.5"
}
}
2 changes: 1 addition & 1 deletion src/cli.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /usr/bin/env node

const program = require("commander");
const program = require("commander").program;

const commands = require("./cli/commands");
const packageJson = require("../package.json");
Expand Down
4 changes: 2 additions & 2 deletions src/init/artifacts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"test": "mocha ./test/**/*.js --timeout 0 --exit"
},
"dependencies": {
"@aeternity/aepp-sdk": "^13.2.2"
"@aeternity/aepp-sdk": "^13.3.2"
},
"devDependencies": {
"chai": "^4.4.1",
"chai-as-promised": "^7.1.1",
"mocha": "^10.3.0"
"mocha": "^10.4.0"
}
}
2 changes: 1 addition & 1 deletion src/init/next-artifacts/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.6"
services:
aeproject_node:
image: aeternity/aeternity:${NODE_TAG:-latest}-bundle
image: aeternity/aeternity:${NODE_TAG:-v7.0.0-rc1}-bundle
hostname: node
# TODO: remove after releasing https://github.com/aeternity/aeternity/pull/4292
healthcheck:
Expand Down
54 changes: 0 additions & 54 deletions src/init/next-artifacts/test/exampleTest.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/init/update-artifacts/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.6"
services:
aeproject_node:
image: aeternity/aeternity:${NODE_TAG:-v6.12.0}-bundle
image: aeternity/aeternity:${NODE_TAG:-v6.13.0}-bundle
hostname: node
# TODO: remove after releasing https://github.com/aeternity/aeternity/pull/4292
healthcheck:
Expand Down
14 changes: 7 additions & 7 deletions tests/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ describe("command line usage", () => {
assert.include(res.stdout, "2 passing");
});

it("init --update --next", async () => {
it("init --update --next; test", async () => {
if (!process.env.AUX_CI_RUN) {
const res = await exec("aeproject init --update --next -y", { cwd });
assert.equal(res.code, 0);
Expand All @@ -107,25 +107,25 @@ describe("command line usage", () => {
file(path.join(cwd, "docker/aeternity.yaml")),
"hard_forks",
);
assert.include(
file(path.join(cwd, "test/exampleTest.js")),
"ignoreVersion: true",
);
assert.include(
file(path.join(cwd, "docker-compose.yml")),
"COMPILER_TAG:-latest",
);
assert.include(
file(path.join(cwd, "docker-compose.yml")),
"NODE_TAG:-latest",
"NODE_TAG:-v7.0.0-rc1",
);

const resEnv = await exec("aeproject env", { cwd });
assert.equal(resEnv.code, 0);
assert.isTrue(await isEnvRunning(cwd));

assert.include(resEnv.stdout, "aeternity/aeternity latest-bundle");
assert.include(resEnv.stdout, "aeternity/aeternity v7.0.0-rc1-bundle");
assert.include(resEnv.stdout, "aeternity/aesophia_http latest");

const resTest = await exec("aeproject test", { cwd });
assert.equal(resTest.code, 0);
assert.include(resTest.stdout, "2 passing");
} else console.log("skipping next test for auxiliary test run");
});

Expand Down

0 comments on commit 63b0fb2

Please sign in to comment.