Skip to content

Commit fda4efd

Browse files
ianhe8xwqsz7xnstwiname
authored
Use node 16 for releases (#640)
* use node 16 for releases * use node 16 for releases * 10sec timeout on genesishash for tests * change to node gallium lts and loosen timeouts on moonbeam tests * Be more consistent specifying node version * Fix indentation * Update yarn to v3 Due to this bug yarnpkg/berry#2074 Co-authored-by: wqsz7xn <[email protected]> Co-authored-by: Scott Twiname <[email protected]>
1 parent 1494b19 commit fda4efd

19 files changed

+4262
-2749
lines changed

.github/workflows/gh-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
with:
1313
fetch-depth: 100
1414

15-
- uses: actions/setup-node@v1
15+
- name: Setup Node.js environment
16+
uses: actions/setup-node@v2
1617
with:
17-
node-version: 14
18-
registry-url: 'https://registry.npmjs.org'
18+
node-version: 16
1919

2020
- run: yarn install
2121

.github/workflows/pr.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,19 @@ on:
33
pull_request:
44
paths-ignore:
55
- '.github/workflows/**'
6-
7-
8-
96
jobs:
107
pr:
118
name: pr
129
runs-on: ubuntu-latest
1310
steps:
14-
- uses: actions/checkout@v1
15-
- name: install node v14
16-
uses: actions/setup-node@v1
11+
- uses: actions/checkout@v2
12+
- name: Setup Node.js environment
13+
uses: actions/setup-node@v2
1714
with:
18-
node-version: 14
15+
node-version: 16
1916
- run: yarn
2017
- name: build
21-
run: yarn workspaces foreach run build
18+
run: yarn build
2219
- name: code-style check
2320
run: yarn pretty-quick --check --pattern 'packages/*/src/**/*' --branch origin/main
2421
- name: lint

.github/workflows/prerelease.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
fetch-depth: 100
3131
token: ${{ secrets.REPO_TOKEN }}
3232

33-
- uses: actions/setup-node@v1
33+
- name: Setup Node.js environment
34+
uses: actions/setup-node@v2
3435
with:
35-
node-version: 14
36-
registry-url: 'https://registry.npmjs.org'
36+
node-version: 16
3737

3838
- uses: marceloprado/has-changed-path@v1
3939
id: changed-types

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
with:
3131
fetch-depth: 100
3232

33-
- uses: actions/setup-node@v1
33+
- name: Setup Node.js environment
34+
uses: actions/setup-node@v2
3435
with:
35-
node-version: 14
36-
registry-url: 'https://registry.npmjs.org'
36+
node-version: 16
3737

3838
#Identify changes
3939
- uses: marceloprado/has-changed-path@v1

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 339 additions & 14 deletions
Large diffs are not rendered by default.

.yarn/plugins/@yarnpkg/plugin-typescript.cjs

Lines changed: 3 additions & 2 deletions
Large diffs are not rendered by default.

.yarn/plugins/@yarnpkg/plugin-version.cjs

Lines changed: 506 additions & 33 deletions
Large diffs are not rendered by default.

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Lines changed: 4 additions & 5 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-2.4.3.cjs

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

.yarn/releases/yarn-3.1.1.cjs

Lines changed: 768 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ npmPublishRegistry: "https://registry.npmjs.org"
1515
plugins:
1616
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
1717
spec: "@yarnpkg/plugin-interactive-tools"
18-
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
19-
spec: "@yarnpkg/plugin-version"
2018
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
2119
spec: "@yarnpkg/plugin-workspace-tools"
2220
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
2321
spec: "@yarnpkg/plugin-typescript"
22+
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
23+
spec: "@yarnpkg/plugin-version"
2424

25-
yarnPath: .yarn/releases/yarn-2.4.3.cjs
25+
yarnPath: .yarn/releases/yarn-3.1.1.cjs

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"scripts": {
4141
"docs:dev": "vuepress dev docs",
4242
"docs:build": "vuepress build docs",
43-
"build": "yarn workspaces foreach -pt run build",
43+
"build": "yarn workspaces foreach -ptA run build",
4444
"lint": "eslint packages --ext .ts",
4545
"test": "jest --coverage",
4646
"test:all": "node --expose-gc ./node_modules/.bin/jest --logHeapUsage --testRegex='.*\\.(spec|test)\\.ts$' --forceExit --ci -w=2 --clearMocks",

packages/cli/src/jsonrpc/jsonrpc.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('test jsonrpc client', () => {
1212
it("Query polkadot's genesisHash via ws endpoint", async () => {
1313
const genesisHash = await getGenesisHash(WS_ENDPOINT);
1414
expect(genesisHash).toEqual(GENESIS_HASH);
15-
});
15+
}, 10000);
1616

1717
it("Query polkadot's genesisHash via http endpoint", async () => {
1818
const genesisHash = await getGenesisHash(HTTP_ENDPOINT);

packages/contract-processors/src/moonbeam.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ const erc20MiniAbi = `[
129129
]`;
130130

131131
describe('MoonbeamDs', () => {
132+
jest.setTimeout(10000);
133+
132134
let api: ApiPromise;
133135

134136
beforeAll(async () => {

packages/node/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# production images
2-
FROM node:14 as builder
2+
FROM node:16 as builder
33
ARG RELEASE_VERSION
44
ENTRYPOINT ["subql-node"]
55
RUN npm i -g --unsafe-perm @subql/node@${RELEASE_VERSION}
66

7-
FROM node:14-alpine
7+
FROM node:16-alpine
88
ENV TZ utc
99

1010
RUN apk add --no-cache tini git

packages/query/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# production images
2-
FROM node:14-alpine
2+
FROM node:16-alpine
33
ENV TZ utc
44

55
ARG RELEASE_VERSION

packages/query/src/graphql/project.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ export class ProjectService {
1111

1212
async getProjectSchema(name: string): Promise<string> {
1313
// After subqueries table has been deprecated, project may not be present in subqueries table
14-
const result: [string] = await this.pool
15-
.query(`SELECT schema_name FROM information_schema.schemata`)
14+
const result = await this.pool
15+
.query<{schema_name: string}, any[]>(`SELECT schema_name FROM information_schema.schemata`)
1616
.then((obj) => obj.rows.map((x) => x.schema_name))
1717
.catch((e) => {
1818
throw new Error(`Unable to fetch all database schemas: ${e}`);

test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:14
1+
FROM node:lts-gallium
22
WORKDIR /workdir
33

44
COPY . .

0 commit comments

Comments
 (0)