aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <vraravam@users.noreply.github.com>2022-04-24 19:29:08 -0500
committerLibravatar Vijay A <vraravam@users.noreply.github.com>2022-04-24 19:29:27 -0500
commite220e15441aef1da6bbaa83728b785833b4867ec (patch)
treec0b722b0080d6167740b965a450a184430dd2e33
parentUpdate submodules, browserslist data updates and linter fixes [skip ci] (diff)
downloadferdium-app-e220e15441aef1da6bbaa83728b785833b4867ec.tar.gz
ferdium-app-e220e15441aef1da6bbaa83728b785833b4867ec.tar.zst
ferdium-app-e220e15441aef1da6bbaa83728b785833b4867ec.zip
Remove dependency on 'jq' since 'node' can be used for the same
-rw-r--r--.github/workflows/builds.yml12
-rw-r--r--CONTRIBUTING.md1
-rwxr-xr-xscripts/build-unix.sh4
3 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index d8fe24e20..58b0e639a 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -138,9 +138,9 @@ jobs:
138 with: 138 with:
139 node-version-file: ".nvmrc" 139 node-version-file: ".nvmrc"
140 - name: Install npm 140 - name: Install npm
141 run: npm i -gf "npm@$(jq --raw-output .engines.npm ./package.json)" && npm -v 141 run: npm i -gf "npm@$(node -p 'require("./package.json").engines.npm')" && npm -v
142 - name: Install pnpm 142 - name: Install pnpm
143 run: npm i -gf "pnpm@$(jq --raw-output .engines.pnpm ./recipes/package.json)" && pnpm -v 143 run: npm i -gf "pnpm@$(node -p 'require("./recipes/package.json").engines.pnpm')" && pnpm -v
144 - name: Install node dependencies 144 - name: Install node dependencies
145 run: npm i 145 run: npm i
146 - name: Package recipes 146 - name: Package recipes
@@ -223,9 +223,9 @@ jobs:
223 with: 223 with:
224 node-version-file: ".nvmrc" 224 node-version-file: ".nvmrc"
225 - name: Install npm 225 - name: Install npm
226 run: npm i -gf "npm@$(jq --raw-output .engines.npm ./package.json)" && npm -v 226 run: npm i -gf "npm@$(node -p 'require("./package.json").engines.npm')" && npm -v
227 - name: Install pnpm 227 - name: Install pnpm
228 run: npm i -gf "pnpm@$(jq --raw-output .engines.pnpm ./recipes/package.json)" && pnpm -v 228 run: npm i -gf "pnpm@$(node -p 'require("./recipes/package.json").engines.pnpm')" && pnpm -v
229 - name: Install node dependencies 229 - name: Install node dependencies
230 run: npm i 230 run: npm i
231 - name: Figure out used package.json version 231 - name: Figure out used package.json version
@@ -313,9 +313,9 @@ jobs:
313 with: 313 with:
314 node-version-file: ".nvmrc" 314 node-version-file: ".nvmrc"
315 - name: Install npm 315 - name: Install npm
316 run: npm i -gf "npm@$(jq --raw-output .engines.npm package.json)" && npm -v 316 run: npm i -gf "npm@$(node -p 'require("./package.json").engines.npm')" && npm -v
317 - name: Install pnpm 317 - name: Install pnpm
318 run: npm i -gf "pnpm@$(jq --raw-output .engines.pnpm ./recipes/package.json)" && pnpm -v 318 run: npm i -gf "pnpm@$(node -p 'require("./recipes/package.json").engines.pnpm')" && pnpm -v
319 - name: Install node dependencies 319 - name: Install node dependencies
320 uses: nick-invision/retry@v2.4.0 320 uses: nick-invision/retry@v2.4.0
321 with: 321 with:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c61da2c9..0551df985 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -64,6 +64,7 @@ Please make sure you are conforming to the `engines` requirements used by the de
64Currently, these are the combinations of system dependencies that work for MacOS/Linux/Windows: 64Currently, these are the combinations of system dependencies that work for MacOS/Linux/Windows:
65 65
66```bash 66```bash
67# Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed
67$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json 68$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
68{ 69{
69 "node": "16.14.2", 70 "node": "16.14.2",
diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh
index 4fbc78413..4cefae0be 100755
--- a/scripts/build-unix.sh
+++ b/scripts/build-unix.sh
@@ -94,14 +94,14 @@ command_exists asdf && asdf reshim nodejs
94 94
95# Ensure that the system dependencies are at the correct version 95# Ensure that the system dependencies are at the correct version
96# Check npm version 96# Check npm version
97EXPECTED_NPM_VERSION=$(jq --raw-output .engines.npm ./package.json) 97EXPECTED_NPM_VERSION=$(node -p 'require("./package.json").engines.npm')
98ACTUAL_NPM_VERSION=$(npm --version) 98ACTUAL_NPM_VERSION=$(npm --version)
99if [[ "$ACTUAL_NPM_VERSION" != "$EXPECTED_NPM_VERSION" ]]; then 99if [[ "$ACTUAL_NPM_VERSION" != "$EXPECTED_NPM_VERSION" ]]; then
100 npm i -gf npm@$EXPECTED_NPM_VERSION 100 npm i -gf npm@$EXPECTED_NPM_VERSION
101fi 101fi
102 102
103# Check pnpm version 103# Check pnpm version
104EXPECTED_PNPM_VERSION=$(jq --raw-output .engines.pnpm ./recipes/package.json) 104EXPECTED_PNPM_VERSION=$(node -p 'require("./recipes/package.json").engines.pnpm')
105ACTUAL_PNPM_VERSION=$(pnpm --version || true) # in case the pnpm executable itself is not present 105ACTUAL_PNPM_VERSION=$(pnpm --version || true) # in case the pnpm executable itself is not present
106if [[ "$ACTUAL_PNPM_VERSION" != "$EXPECTED_PNPM_VERSION" ]]; then 106if [[ "$ACTUAL_PNPM_VERSION" != "$EXPECTED_PNPM_VERSION" ]]; then
107 npm i -gf pnpm@$EXPECTED_PNPM_VERSION 107 npm i -gf pnpm@$EXPECTED_PNPM_VERSION