From 712c2a4c237248b63d6553f557806d5dcce797f1 Mon Sep 17 00:00:00 2001 From: kytwb Date: Tue, 21 Dec 2021 20:05:02 +0100 Subject: Revert "Upgrade system dependencies (node, npm, pnpm, node-gyp) (#2336)" This reverts commit dfc9975fa409f69044fbfb028b3c48590908ec5d. --- .github/workflows/builds.yml | 22 +++++++++++----------- .github/workflows/dependency-updates.yml | 6 +++--- .nvmrc | 2 +- CONTRIBUTING.md | 6 +++--- Dockerfile | 4 ++-- package-lock.json | 22 +++++++++++----------- package.json | 6 +++--- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index fc8636f6f..3f356e1e0 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -47,11 +47,11 @@ jobs: submodules: recursive fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging # ssh-key: ${{ secrets.FERDI_PUBLISH_TOKEN }} - - name: Use Node.js specified in the '.nvmrc' file + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} with: - node-version-file: '.nvmrc' + node-version: 16.13.0 - id: should_run name: Check whether there are any commits since this run was last triggered and push them and/or set the output if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} @@ -134,14 +134,14 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js specified in the '.nvmrc' file + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 with: - node-version-file: '.nvmrc' + node-version: 16.13.0 - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: - version: 6.24.1 + version: 6.23.6 - name: Install node dependencies run: npm i - name: Package recipes @@ -216,14 +216,14 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js specified in the '.nvmrc' file + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 with: - node-version-file: '.nvmrc' + node-version: 16.13.0 - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: - version: 6.24.1 + version: 6.23.6 - name: Install node dependencies run: npm i - name: Figure out used package.json version @@ -319,14 +319,14 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js specified in the '.nvmrc' file + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 with: - node-version-file: '.nvmrc' + node-version: 16.13.0 - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: - version: 6.24.1 + version: 6.23.6 - name: Install node dependencies run: npm i shell: bash diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index eb69b049b..7958aa5f5 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml @@ -31,14 +31,14 @@ jobs: run: | echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV shell: bash - - name: Use Node.js specified in the '.nvmrc' file + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 with: - node-version-file: '.nvmrc' + node-version: 16.13.0 - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: - version: 6.24.1 + version: 6.23.6 - name: Install node dependencies run: npm i - name: Update submodules diff --git a/.nvmrc b/.nvmrc index 07c142ffe..58a4133d9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.13.1 +16.13.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a379f80dd..55c5303d7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,11 +60,11 @@ Currently, these are the combinations of system dependencies that work for MacOS ```bash node -v -v16.13.1 +v16.13.0 npm -v -8.1.2 +8.1.1 pnpm -v -6.24.1 +6.23.6 ``` _Note:_ You can choose any package manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf). diff --git a/Dockerfile b/Dockerfile index 372a2c8cb..3e02fe64c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture -FROM docker.io/library/node:16.13.1-buster as builder +FROM docker.io/library/node:16.13.0-buster as builder ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" @@ -16,7 +16,7 @@ RUN apt-get update -y \ WORKDIR /usr/src/ferdi -RUN npm i -g npm@8.1.2 pnpm@6.24.1 +RUN npm i -g pnpm@6.23.6 COPY package*.json ./ diff --git a/package-lock.json b/package-lock.json index f23b67c3a..e1cc9af49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -149,7 +149,7 @@ "jest": "^27.3.1", "kebab-case": "^1.0.1", "mocha": "^9.1.3", - "node-gyp": "8.4.1", + "node-gyp": "8.4.0", "prettier": "^2.4.1", "preval-build-info": "^1.0.3", "rimraf": "^3.0.2", @@ -165,8 +165,8 @@ "webpack-dev-server": "^3.11.2" }, "engines": { - "node": "^16.13.1", - "npm": "^8.1.2" + "node": "^16.13.0", + "npm": "^8.1.0" }, "optionalDependencies": { "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb" @@ -21350,9 +21350,9 @@ "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" }, "node_modules/node-gyp": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", - "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz", + "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==", "dev": true, "dependencies": { "env-paths": "^2.2.0", @@ -21360,7 +21360,7 @@ "graceful-fs": "^4.2.6", "make-fetch-happen": "^9.1.0", "nopt": "^5.0.0", - "npmlog": "^6.0.0", + "npmlog": "^4.1.2", "rimraf": "^3.0.2", "semver": "^7.3.5", "tar": "^6.1.2", @@ -48036,9 +48036,9 @@ "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" }, "node-gyp": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", - "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz", + "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==", "dev": true, "requires": { "env-paths": "^2.2.0", @@ -48046,7 +48046,7 @@ "graceful-fs": "^4.2.6", "make-fetch-happen": "^9.1.0", "nopt": "^5.0.0", - "npmlog": "^6.0.0", + "npmlog": "^4.1.2", "rimraf": "^3.0.2", "semver": "^7.3.5", "tar": "^6.1.2", diff --git a/package.json b/package.json index 4e9d1d067..356fe6098 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "repository": "https://github.com/getferdi/ferdi.git", "private": true, "engines": { - "node": "^16.13.1", - "npm": "^8.1.2" + "node": "^16.13.0", + "npm": "^8.1.0" }, "engine-strict": true, "scripts": { @@ -185,7 +185,7 @@ "jest": "^27.3.1", "kebab-case": "^1.0.1", "mocha": "^9.1.3", - "node-gyp": "8.4.1", + "node-gyp": "8.4.0", "prettier": "^2.4.1", "preval-build-info": "^1.0.3", "rimraf": "^3.0.2", -- cgit v1.2.3-70-g09d2