Skip to content

Commit 104cbe4

Browse files
committed
feat: default to use ceres
1 parent 1873974 commit 104cbe4

File tree

11 files changed

+32
-88
lines changed

11 files changed

+32
-88
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
strategy:
88
matrix:
99
node-version: [16, 18, 20, 21]
10-
node-tag: [latest]
11-
compiler-tag: [latest]
10+
node-tag: [v7.0.0] # latest known good
11+
compiler-tag: [v8.0.0] # latest known good
1212
aux-ci-run: [true]
1313

1414
# for lts node also test first known compatible and latest known good compiler and node versions
@@ -17,6 +17,10 @@ jobs:
1717
node-tag: v6.8.0 # v6.3.0 to v6.7.0 use a different config format
1818
compiler-tag: v7.4.0
1919
aux-ci-run: true
20+
- node-version: 20
21+
node-tag: latest
22+
compiler-tag: latest
23+
aux-ci-run: true
2024
- node-version: 20
2125
node-tag: # latest known good versions are defaulted to, thus not passed explicitly
2226
compiler-tag:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ npm install -g @aeternity/aeproject
1818
- [Unit Testing](docs/cli/test.md)
1919
- [AEproject Library](docs/lib.md)
2020
- [Migration from 3.x.x to 4.x.x](docs/migration-from-3.x.x-to-4.x.x.md)
21-
- [Upcoming Hard-Fork / Ceres Support](docs/ceres-support.md)
21+
- [Upcoming Version Support](docs/next-support.md)
2222

2323
## Release Process
2424

docs/ceres-support.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

docs/cli/env.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ aeproject env --stop
1717
There are optional parameters **\-\-nodeVersion** and **\-\-compilerVersion**. To specify a specific version of node or compiler, or both
1818

1919
```text
20-
aeproject env --nodeVersion v6.12.0
20+
aeproject env --nodeVersion v7.0.0
2121
# or
22-
aeproject env --compilerVersion v7.6.1
22+
aeproject env --compilerVersion v8.0.0
2323
# or
24-
aeproject env --nodeVersion v6.12.0 --compilerVersion v7.6.1
24+
aeproject env --nodeVersion v7.0.0 --compilerVersion v8.0.0
2525
```
2626

2727
This also applies to the commands `aeproject node` and `aeproject compiler`.

docs/next-support.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Upcoming Version Support
2+
3+
Aeproject can already be used for testing and setup with the upcoming node versions.
4+
5+
### Automatic update
6+
7+
Use `aeproject init --next ` to initialize a new project that has the necessary adjustments to use the latest versions.
8+
9+
Use `aeproject init --update --next` to update an existing project with the adjustments to use the latest versions.
10+
11+
### Manual update
12+
13+
- change occurrences of `utils.getSdk()` to use `utils.getSdk({ ignoreVersion: true })` if needed or use the same option for manually initialized sdk `Node` and `CompilerHttp`
14+
- update `docker-compose.yml` to use the `latest` node and compiler tags or specify it manually in running with `aeproject env --nodeVersion latest --compilerVersion latest`

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ nav:
4747
- cli/test.md
4848
- lib.md
4949
- migration-from-3.x.x-to-4.x.x.md
50-
- ceres-support.md
50+
- next-support.md

src/init/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async function run(folder, update, next, y) {
2222
await createAEprojectProjectStructure(folder);
2323
}
2424

25-
// currently implements ceres patches, might be different in the future when ceres is the default
25+
// currently just patches to use latest node/compiler versions, can be reused in the future for upcoming breaking changes
2626
if (next) await patchForNextRelease(folder, y);
2727
}
2828

src/init/next-artifacts/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.6"
22
services:
33
aeproject_node:
4-
image: aeternity/aeternity:${NODE_TAG:-v7.0.0-rc1}-bundle
4+
image: aeternity/aeternity:${NODE_TAG:-latest}-bundle
55
hostname: node
66
# TODO: remove after releasing https://github.com/aeternity/aeternity/pull/4292
77
healthcheck:

src/init/next-artifacts/docker/aeternity.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/init/update-artifacts/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.6"
22
services:
33
aeproject_node:
4-
image: aeternity/aeternity:${NODE_TAG:-v6.13.0}-bundle
4+
image: aeternity/aeternity:${NODE_TAG:-v7.0.0}-bundle
55
hostname: node
66
# TODO: remove after releasing https://github.com/aeternity/aeternity/pull/4292
77
healthcheck:
@@ -14,7 +14,7 @@ services:
1414
- "./docker/accounts.json:/home/aeternity/node/data/aecore/.genesis/accounts_test.json"
1515

1616
aeproject_compiler:
17-
image: aeternity/aesophia_http:${COMPILER_TAG:-v7.6.1}
17+
image: aeternity/aesophia_http:${COMPILER_TAG:-v8.0.0}
1818
hostname: compiler
1919
# TODO: remove after releasing https://github.com/aeternity/aesophia_http/pull/133
2020
healthcheck:

tests/cli.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ describe("command line usage", () => {
7979
it("env --info", async () => {
8080
const res = await exec("aeproject env --info", { cwd });
8181
assert.equal(res.code, 0);
82+
8283
print(res.stdout);
8384
});
8485

@@ -103,24 +104,20 @@ describe("command line usage", () => {
103104
"===== updating project file and directory structure for next version =====",
104105
);
105106

106-
assert.include(
107-
file(path.join(cwd, "docker/aeternity.yaml")),
108-
"hard_forks",
109-
);
110107
assert.include(
111108
file(path.join(cwd, "docker-compose.yml")),
112109
"COMPILER_TAG:-latest",
113110
);
114111
assert.include(
115112
file(path.join(cwd, "docker-compose.yml")),
116-
"NODE_TAG:-v7.0.0-rc1",
113+
"NODE_TAG:-latest",
117114
);
118115

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

123-
assert.include(resEnv.stdout, "aeternity/aeternity v7.0.0-rc1-bundle");
120+
assert.include(resEnv.stdout, "aeternity/aeternity latest");
124121
assert.include(resEnv.stdout, "aeternity/aesophia_http latest");
125122

126123
const resTest = await exec("aeproject test", { cwd });

0 commit comments

Comments
 (0)