From 6f7072662c9672a9e69e16cdc289c570ca6dd526 Mon Sep 17 00:00:00 2001 From: Bobbie Soedirgo Date: Sun, 17 Sep 2023 17:31:26 +0800 Subject: [PATCH 1/2] feat: bump node to 18 --- .github/workflows/ci.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/publish-deps.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- Dockerfile | 4 ++-- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f15fa61..07c28a93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" - run: | npm clean-install diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e6a40247..99e5a5ed 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" - run: | npm clean-install diff --git a/.github/workflows/publish-deps.yml b/.github/workflows/publish-deps.yml index 73a4d7b3..aa128411 100644 --- a/.github/workflows/publish-deps.yml +++ b/.github/workflows/publish-deps.yml @@ -5,8 +5,8 @@ on: jobs: publish: - # Must match glibc verison in node:16-bullseye - runs-on: ubuntu-20.04 + # Must match glibc verison in node:18 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16' + node-version: '18' - run: npm i - run: npm run binary:build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52af70c1..3988f94f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16' + node-version: '18' - run: | npm clean-install @@ -43,7 +43,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: '16' + node-version: '18' - name: Prepare release run: | diff --git a/Dockerfile b/Dockerfile index 4a01321b..53c9a207 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-bullseye as build +FROM node:18 as build WORKDIR /usr/src/app # Do `npm ci` separately so we can cache `node_modules` # https://nodejs.org/en/docs/guides/nodejs-docker-webapp/ @@ -7,7 +7,7 @@ RUN npm clean-install COPY . . RUN npm run build && npm prune --omit=dev -FROM node:16-bullseye-slim +FROM node:18-slim WORKDIR /usr/src/app COPY --from=build /usr/src/app/node_modules node_modules COPY --from=build /usr/src/app/dist dist diff --git a/package-lock.json b/package-lock.json index 0e6947ad..6febd2ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "devDependencies": { "@types/crypto-js": "^4.1.1", "@types/jest": "^29.2.4", - "@types/node": "^16.18.3", + "@types/node": "^18.17.17", "@types/pg": "^8.6.5", "@types/pg-format": "^1.0.1", "@types/prettier": "^2.7.3", @@ -45,7 +45,7 @@ "wait-for-localhost-cli": "^3.0.0" }, "engines": { - "node": ">=16", + "node": ">=18", "npm": ">=8" } }, @@ -1681,9 +1681,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "16.18.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz", - "integrity": "sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==", + "version": "18.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.17.tgz", + "integrity": "sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw==", "dev": true }, "node_modules/@types/normalize-package-data": { @@ -9997,9 +9997,9 @@ "dev": true }, "@types/node": { - "version": "16.18.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz", - "integrity": "sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==", + "version": "18.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.17.tgz", + "integrity": "sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw==", "dev": true }, "@types/normalize-package-data": { diff --git a/package.json b/package.json index ecd0c9fd..3678ca7e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "test:update": "run-s db:clean db:run && node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --updateSnapshot && run-s db:clean" }, "engines": { - "node": ">=16", + "node": ">=18", "npm": ">=8" }, "jest": { @@ -75,7 +75,7 @@ "devDependencies": { "@types/crypto-js": "^4.1.1", "@types/jest": "^29.2.4", - "@types/node": "^16.18.3", + "@types/node": "^18.17.17", "@types/pg": "^8.6.5", "@types/pg-format": "^1.0.1", "@types/prettier": "^2.7.3", From f2877912604b739c9ff7101ca59f4e99910e4a98 Mon Sep 17 00:00:00 2001 From: Bobbie Soedirgo Date: Mon, 18 Sep 2023 10:10:04 +0800 Subject: [PATCH 2/2] test --- .github/workflows/publish-deps.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-deps.yml b/.github/workflows/publish-deps.yml index aa128411..bb154ae5 100644 --- a/.github/workflows/publish-deps.yml +++ b/.github/workflows/publish-deps.yml @@ -6,13 +6,15 @@ on: jobs: publish: # Must match glibc verison in node:18 - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 with: repository: 'pyramation/libpg-query-node' ref: 'v13' + - run: ldd --version && exit 1 + - uses: actions/setup-node@v3 with: node-version: '18'