diff options
author | kytwb <kytwb@pm.me> | 2022-01-02 12:24:40 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2022-01-02 12:24:40 +0100 |
commit | 4c8a2c1842551b64f557b2bc957cddcbdf2e11de (patch) | |
tree | 2782d662eb55b88af3cec46c58a4fb7fcb9798b4 /.github/workflows | |
parent | 5.6.7 (diff) | |
download | ferdium-app-4c8a2c1842551b64f557b2bc957cddcbdf2e11de.tar.gz ferdium-app-4c8a2c1842551b64f557b2bc957cddcbdf2e11de.tar.zst ferdium-app-4c8a2c1842551b64f557b2bc957cddcbdf2e11de.zip |
Revert "Revert "Upgrade system dependencies (node, npm, pnpm, node-gyp) (#2336)""
This reverts commit 712c2a4c237248b63d6553f557806d5dcce797f1.
# Conflicts:
# .github/workflows/builds.yml
Diffstat (limited to '.github/workflows')
-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 0a535376c..b570dbc44 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 16.13.0 | 50 | - name: Use Node.js specified in the '.nvmrc' file |
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: 16.13.0 | 54 | node-version-file: '.nvmrc' |
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 16.13.0 | 137 | - name: Use Node.js specified in the '.nvmrc' file |
138 | uses: actions/setup-node@v2 | 138 | uses: actions/setup-node@v2 |
139 | with: | 139 | with: |
140 | node-version: 16.13.0 | 140 | node-version-file: '.nvmrc' |
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.23.6 | 144 | version: 6.24.1 |
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 16.13.0 | 219 | - name: Use Node.js specified in the '.nvmrc' file |
220 | uses: actions/setup-node@v2 | 220 | uses: actions/setup-node@v2 |
221 | with: | 221 | with: |
222 | node-version: 16.13.0 | 222 | node-version-file: '.nvmrc' |
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.23.6 | 226 | version: 6.24.1 |
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 |
@@ -301,14 +301,14 @@ jobs: | |||
301 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 301 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
302 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 302 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
303 | shell: bash | 303 | shell: bash |
304 | - name: Use Node.js 16.13.0 | 304 | - name: Use Node.js specified in the '.nvmrc' file |
305 | uses: actions/setup-node@v2 | 305 | uses: actions/setup-node@v2 |
306 | with: | 306 | with: |
307 | node-version: 16.13.0 | 307 | node-version-file: '.nvmrc' |
308 | - name: Install pnpm | 308 | - name: Install pnpm |
309 | uses: pnpm/action-setup@v2.0.1 | 309 | uses: pnpm/action-setup@v2.0.1 |
310 | with: | 310 | with: |
311 | version: 6.23.6 | 311 | version: 6.24.1 |
312 | - name: Install node dependencies | 312 | - name: Install node dependencies |
313 | uses: nick-invision/retry@v2.4.0 | 313 | uses: nick-invision/retry@v2.4.0 |
314 | with: | 314 | with: |
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index 7958aa5f5..eb69b049b 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 16.13.0 | 34 | - name: Use Node.js specified in the '.nvmrc' file |
35 | uses: actions/setup-node@v2 | 35 | uses: actions/setup-node@v2 |
36 | with: | 36 | with: |
37 | node-version: 16.13.0 | 37 | node-version-file: '.nvmrc' |
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.23.6 | 41 | version: 6.24.1 |
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 |