Skip to content

Commit 331ffc2

Browse files
spotandjakephated
andauthored
chore!: Require node version >=18.15 for WASI support (#1612)
* feat!: Switch To Node V18 This commit switches grain to use node v18 over node v16 * chore!: Require node >=19.6 * Update lockfile * some more node version refs * longer near smoketest timeout * massive timeout * try updating near-workspaces dep * they changed the api * trying to fix this trash * More hacks around * One more hack to attempt * chore(ci): Remove NEAR smoketest which does not run on node 18+ * switch to pkg fork, node 18.15 as minimum * update all workflows * update comment * missed some references * Needed to remove near test from updated workflows --------- Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com>
1 parent 3cb862a commit 331ffc2

File tree

16 files changed

+5681
-13766
lines changed

16 files changed

+5681
-13766
lines changed

.github/workflows/build-js.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Setup node.js
4545
uses: actions/setup-node@v3.6.0
4646
with:
47-
node-version: "16"
47+
node-version: ">=18.15"
4848
check-latest: true
4949
cache: "npm"
5050

@@ -116,11 +116,3 @@ jobs:
116116
with:
117117
path: ./grain.tar
118118
name: grain-linux-x64
119-
120-
# This is to test that we didn't actually introduce multivalue
121-
# which might happen through a binaryen optimization
122-
- name: Run NEAR smoketest
123-
if: inputs.os != 'windows-latest'
124-
run: |
125-
npm run stdlib clean
126-
npm run cli test

.github/workflows/build-native.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Setup node.js
4545
uses: actions/setup-node@v3.6.0
4646
with:
47-
node-version: "16"
47+
node-version: ">=18.15"
4848
check-latest: true
4949
cache: "npm"
5050

@@ -125,11 +125,3 @@ jobs:
125125
grain format stdlib -o stdlib
126126
grain format compiler/test/stdlib -o compiler/test/stdlib
127127
git diff --exit-code --name-only
128-
129-
# This is to test that we didn't actually introduce multivalue
130-
# which might happen through a binaryen optimization
131-
- name: Run NEAR smoketest
132-
if: inputs.os != 'windows-latest'
133-
run: |
134-
npm run stdlib clean
135-
npm run cli test

.github/workflows/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
if: steps.esy-cache.outputs.cache-hit != 'true'
3131
uses: actions/setup-node@v3.6.0
3232
with:
33-
node-version: "16"
33+
node-version: ">=18.15"
3434
check-latest: true
3535
cache: "npm"
3636

.github/workflows/release.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- name: Setup Node.js
9999
uses: actions/setup-node@v3.6.0
100100
with:
101-
node-version: "16"
101+
node-version: ">=18.15"
102102
check-latest: true
103103
cache: "npm"
104104

@@ -185,7 +185,8 @@ jobs:
185185
- name: Setup NodeJS
186186
uses: actions/setup-node@v3.6.0
187187
with:
188-
node-version: "16"
188+
node-version: ">=18.15"
189+
check-latest: true
189190
registry-url: "https://registry.npmjs.org"
190191

191192
- name: Publish to npm
@@ -203,7 +204,8 @@ jobs:
203204
- name: Setup NodeJS
204205
uses: actions/setup-node@v3.6.0
205206
with:
206-
node-version: "16"
207+
node-version: ">=18.15"
208+
check-latest: true
207209
registry-url: "https://registry.npmjs.org"
208210

209211
- name: Publish to npm

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile constructs an environment in which the Grain compiler can be built and used.
22

33
FROM ospencer/esy:alpine as esy
4-
FROM node:16
4+
FROM node:18
55

66
LABEL name="Grain"
77
LABEL description="Grain CLI"

Dockerfile-slim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# The environment is only meant to build Grain programs, not develop the compiler.
33

44
FROM ospencer/esy:alpine as esy
5-
FROM node:16 as builder
5+
FROM node:18 as builder
66

77
LABEL name="Grain"
88
LABEL description="Grain CLI"
@@ -31,7 +31,7 @@ RUN npm run compiler build \
3131
# Remove build files
3232
&& rm -rf compiler/_esy
3333

34-
FROM node:16-slim
34+
FROM node:18-slim
3535

3636
COPY --from=builder /grain /grain
3737
WORKDIR /grain

cli/__test__/index.gr

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

cli/__test__/near.spec.js

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

cli/__test__/nearEnv.gr

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

cli/__test__/wasi.gr

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

0 commit comments

Comments
 (0)