diff options
author | kytwb <kytwb@pm.me> | 2021-12-21 20:05:02 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2021-12-21 20:05:02 +0100 |
commit | 712c2a4c237248b63d6553f557806d5dcce797f1 (patch) | |
tree | 46c8e9648c30409734981b7ccbf823a2805255c8 /.github | |
parent | 5.6.5 (diff) | |
download | ferdium-app-712c2a4c237248b63d6553f557806d5dcce797f1.tar.gz ferdium-app-712c2a4c237248b63d6553f557806d5dcce797f1.tar.zst ferdium-app-712c2a4c237248b63d6553f557806d5dcce797f1.zip |
Revert "Upgrade system dependencies (node, npm, pnpm, node-gyp) (#2336)"
This reverts commit dfc9975fa409f69044fbfb028b3c48590908ec5d.
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/builds.yml | 22 | ||||
-rw-r--r-- | .github/workflows/dependency-updates.yml | 6 |
2 files changed, 14 insertions, 14 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: | |||
47 | submodules: recursive | 47 | submodules: recursive |
48 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | 48 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging |
49 | # ssh-key: ${{ secrets.FERDI_PUBLISH_TOKEN }} | 49 | # ssh-key: ${{ secrets.FERDI_PUBLISH_TOKEN }} |
50 | - name: Use Node.js specified in the '.nvmrc' file | 50 | - name: Use Node.js 16.13.0 |
51 | uses: actions/setup-node@v2 | 51 | uses: actions/setup-node@v2 |
52 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} | 52 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} |
53 | with: | 53 | with: |
54 | node-version-file: '.nvmrc' | 54 | node-version: 16.13.0 |
55 | - id: should_run | 55 | - id: should_run |
56 | name: Check whether there are any commits since this run was last triggered and push them and/or set the output | 56 | name: Check whether there are any commits since this run was last triggered and push them and/or set the output |
57 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} | 57 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} |
@@ -134,14 +134,14 @@ jobs: | |||
134 | with: | 134 | with: |
135 | key: ${{ runner.os }}-${{ env.cache-name }} | 135 | key: ${{ runner.os }}-${{ env.cache-name }} |
136 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 136 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
137 | - name: Use Node.js specified in the '.nvmrc' file | 137 | - name: Use Node.js 16.13.0 |
138 | uses: actions/setup-node@v2 | 138 | uses: actions/setup-node@v2 |
139 | with: | 139 | with: |
140 | node-version-file: '.nvmrc' | 140 | node-version: 16.13.0 |
141 | - name: Install pnpm | 141 | - name: Install pnpm |
142 | uses: pnpm/action-setup@v2.0.1 | 142 | uses: pnpm/action-setup@v2.0.1 |
143 | with: | 143 | with: |
144 | version: 6.24.1 | 144 | version: 6.23.6 |
145 | - name: Install node dependencies | 145 | - name: Install node dependencies |
146 | run: npm i | 146 | run: npm i |
147 | - name: Package recipes | 147 | - name: Package recipes |
@@ -216,14 +216,14 @@ jobs: | |||
216 | with: | 216 | with: |
217 | key: ${{ runner.os }}-${{ env.cache-name }} | 217 | key: ${{ runner.os }}-${{ env.cache-name }} |
218 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 218 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
219 | - name: Use Node.js specified in the '.nvmrc' file | 219 | - name: Use Node.js 16.13.0 |
220 | uses: actions/setup-node@v2 | 220 | uses: actions/setup-node@v2 |
221 | with: | 221 | with: |
222 | node-version-file: '.nvmrc' | 222 | node-version: 16.13.0 |
223 | - name: Install pnpm | 223 | - name: Install pnpm |
224 | uses: pnpm/action-setup@v2.0.1 | 224 | uses: pnpm/action-setup@v2.0.1 |
225 | with: | 225 | with: |
226 | version: 6.24.1 | 226 | version: 6.23.6 |
227 | - name: Install node dependencies | 227 | - name: Install node dependencies |
228 | run: npm i | 228 | run: npm i |
229 | - name: Figure out used package.json version | 229 | - name: Figure out used package.json version |
@@ -319,14 +319,14 @@ jobs: | |||
319 | with: | 319 | with: |
320 | key: ${{ runner.os }}-${{ env.cache-name }} | 320 | key: ${{ runner.os }}-${{ env.cache-name }} |
321 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 321 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
322 | - name: Use Node.js specified in the '.nvmrc' file | 322 | - name: Use Node.js 16.13.0 |
323 | uses: actions/setup-node@v2 | 323 | uses: actions/setup-node@v2 |
324 | with: | 324 | with: |
325 | node-version-file: '.nvmrc' | 325 | node-version: 16.13.0 |
326 | - name: Install pnpm | 326 | - name: Install pnpm |
327 | uses: pnpm/action-setup@v2.0.1 | 327 | uses: pnpm/action-setup@v2.0.1 |
328 | with: | 328 | with: |
329 | version: 6.24.1 | 329 | version: 6.23.6 |
330 | - name: Install node dependencies | 330 | - name: Install node dependencies |
331 | run: npm i | 331 | run: npm i |
332 | shell: bash | 332 | 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: | |||
31 | run: | | 31 | run: | |
32 | echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 32 | echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
33 | shell: bash | 33 | shell: bash |
34 | - name: Use Node.js specified in the '.nvmrc' file | 34 | - name: Use Node.js 16.13.0 |
35 | uses: actions/setup-node@v2 | 35 | uses: actions/setup-node@v2 |
36 | with: | 36 | with: |
37 | node-version-file: '.nvmrc' | 37 | node-version: 16.13.0 |
38 | - name: Install pnpm | 38 | - name: Install pnpm |
39 | uses: pnpm/action-setup@v2.0.1 | 39 | uses: pnpm/action-setup@v2.0.1 |
40 | with: | 40 | with: |
41 | version: 6.24.1 | 41 | version: 6.23.6 |
42 | - name: Install node dependencies | 42 | - name: Install node dependencies |
43 | run: npm i | 43 | run: npm i |
44 | - name: Update submodules | 44 | - name: Update submodules |