From fb14ad98a85526312c50d5c5cc0157918726a8cf Mon Sep 17 00:00:00 2001 From: Daniel Cooper <5233036+danielcooperxyz@users.noreply.github.com> Date: Wed, 2 Feb 2022 10:09:23 +0000 Subject: [PATCH] update and pin node version (#11) * update and pin node version * pin npm --- .github/workflows/release.yml | 25 +++++++++++++++---------- .github/workflows/tests.yml | 12 +++++++++--- .node-version | 1 - Dockerfile | 4 ++-- helm/vitalam-ipfs/Chart.yaml | 4 ++-- helm/vitalam-ipfs/values.yaml | 2 +- package-lock.json | 7 ++++--- package.json | 5 +++-- 8 files changed, 36 insertions(+), 24 deletions(-) delete mode 100644 .node-version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e4a2d10..80d68f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,10 +2,9 @@ name: Release on: push: - branches: ["main"] + branches: ['main'] jobs: - preconditions: runs-on: ubuntu-latest outputs: @@ -66,7 +65,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v1 with: - buildkitd-flags: "--debug" + buildkitd-flags: '--debug' - name: Set up Helm uses: azure/setup-helm@v1 with: @@ -110,6 +109,8 @@ jobs: - uses: actions/setup-node@master with: node-version: 16.x + - name: Use npm v8 + run: npm install -g npm@8 - name: Cache Node.js modules uses: actions/cache@v1 with: @@ -131,6 +132,8 @@ jobs: - uses: actions/setup-node@master with: node-version: 16.x + - name: Use npm v8 + run: npm install -g npm@8 - name: Cache Node.js modules uses: actions/cache@v1 with: @@ -152,6 +155,8 @@ jobs: - uses: actions/setup-node@master with: node-version: 16.x + - name: Use npm v8 + run: npm install -g npm@8 - name: Cache Node.js modules uses: actions/cache@v1 with: @@ -167,11 +172,11 @@ jobs: - name: Sleep uses: kibertoad/wait-action@1.0.1 with: - time: "30s" + time: '30s' - name: Run tests run: npm run test check-version: - name: "Check version" + name: 'Check version' runs-on: ubuntu-latest outputs: is_new_version: ${{ steps.get_version.outputs.IS_NEW_VERSION }} @@ -195,7 +200,7 @@ jobs: echo "Skipping release as current version has already been published" publish: - name: "Publish package" + name: 'Publish package' needs: - preconditions - helm-lint @@ -219,7 +224,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v1 with: - buildkitd-flags: "--debug" + buildkitd-flags: '--debug' - name: Login to GitHub Container Registry uses: docker/login-action@v1 with: @@ -258,7 +263,7 @@ jobs: - name: Build release version uses: softprops/action-gh-release@v1 with: - token: "${{ secrets.GITHUB_TOKEN }}" + token: '${{ secrets.GITHUB_TOKEN }}' tag_name: ${{ needs.check-version.outputs.version }} prerelease: false name: ${{ needs.check-version.outputs.version }} @@ -274,11 +279,11 @@ jobs: } catch (err) { if (err.status !== 422) throw err - } + } - name: Build release latest uses: softprops/action-gh-release@v1 with: - token: "${{ secrets.GITHUB_TOKEN }}" + token: '${{ secrets.GITHUB_TOKEN }}' tag_name: latest prerelease: false name: Latest ${{ needs.check-version.outputs.version }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 745c8cb..f45fdb3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,7 +2,7 @@ name: Lint and Test on: push: - branches-ignore: ["main"] + branches-ignore: ['main'] jobs: repo_ids: @@ -59,7 +59,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v1 with: - buildkitd-flags: "--debug" + buildkitd-flags: '--debug' - name: Set up Helm uses: azure/setup-helm@v1 with: @@ -102,6 +102,8 @@ jobs: - uses: actions/setup-node@master with: node-version: 16.x + - name: Use npm v8 + run: npm install -g npm@8 - name: Cache Node.js modules uses: actions/cache@v1 with: @@ -122,6 +124,8 @@ jobs: - uses: actions/setup-node@master with: node-version: 16.x + - name: Use npm v8 + run: npm install -g npm@8 - name: Cache Node.js modules uses: actions/cache@v1 with: @@ -143,6 +147,8 @@ jobs: - uses: actions/setup-node@master with: node-version: 16.x + - name: Use npm v8 + run: npm install -g npm@8 - name: Cache Node.js modules uses: actions/cache@v1 with: @@ -163,7 +169,7 @@ jobs: run: npm run test check-version: - name: "Check version" + name: 'Check version' runs-on: ubuntu-latest steps: diff --git a/.node-version b/.node-version deleted file mode 100644 index 23d9c36..0000000 --- a/.node-version +++ /dev/null @@ -1 +0,0 @@ -16.13.2 diff --git a/Dockerfile b/Dockerfile index d7ec073..2e08971 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.3-labs ARG IPFS_BUILD_IMAGE_VERSION=1.17-alpine3.15 -ARG NODE_RUNTIME_IMAGE_VERSION=16.13.2-alpine +ARG NODE_RUNTIME_IMAGE_VERSION=16-alpine FROM golang:$IPFS_BUILD_IMAGE_VERSION AS ipfs_build ENV SRC_DIR /go/src/github.com/ipfs/go-ipfs @@ -22,7 +22,7 @@ rm -rf $SRC_DIR EOF FROM node:$NODE_RUNTIME_IMAGE_VERSION AS runtime -RUN npm i -g npm@latest +RUN npm i -g npm@8.x.x ARG LOGLEVEL ENV NPM_CONFIG_LOGLEVEL ${LOGLEVEL} diff --git a/helm/vitalam-ipfs/Chart.yaml b/helm/vitalam-ipfs/Chart.yaml index cde254b..72963b9 100644 --- a/helm/vitalam-ipfs/Chart.yaml +++ b/helm/vitalam-ipfs/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: vitalam-ipfs -appVersion: '1.2.1' +appVersion: '1.2.2' description: A Helm chart for vitalam-ipfs -version: '1.2.1' +version: '1.2.2' type: application dependencies: - name: vitalam-node diff --git a/helm/vitalam-ipfs/values.yaml b/helm/vitalam-ipfs/values.yaml index 5827291..de5ae1f 100644 --- a/helm/vitalam-ipfs/values.yaml +++ b/helm/vitalam-ipfs/values.yaml @@ -17,7 +17,7 @@ config: image: repository: ghcr.io/digicatapult/vitalam-ipfs pullPolicy: IfNotPresent - tag: 'v1.2.1' + tag: 'v1.2.2' storage: storageClass: "" diff --git a/package-lock.json b/package-lock.json index c39caef..4334a7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@digicatapult/vitalam-ipfs", - "version": "1.2.1", + "version": "1.2.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@digicatapult/vitalam-ipfs", - "version": "1.2.1", + "version": "1.2.2", "license": "Apache-2.0", "dependencies": { "@polkadot/api": "^5.9.1", @@ -34,7 +34,8 @@ "sinon": "^12.0.1" }, "engines": { - "node": ">=16.13.2" + "node": "16.x.x", + "npm": "8.x.x" } }, "node_modules/@babel/code-frame": { diff --git a/package.json b/package.json index 1e9ef9e..34143cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@digicatapult/vitalam-ipfs", - "version": "1.2.1", + "version": "1.2.2", "description": "Service for WASP", "main": "app/index.js", "scripts": { @@ -18,7 +18,8 @@ "url": "git+https://github.com/digicatapult/vitalam-ipfs.git" }, "engines": { - "node": ">=16.13.2" + "node": "16.x.x", + "npm": "8.x.x" }, "keywords": [ "WASP"