diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-10-28 19:28:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-28 22:58:42 +0530 |
commit | 0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd (patch) | |
tree | 1418ee325d431d10e4f969f90a75e23f58b7ad6c /.github/workflows | |
parent | New translations en-US.json (French) (#2155) (diff) | |
download | ferdium-app-0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd.tar.gz ferdium-app-0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd.tar.zst ferdium-app-0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd.zip |
build: use node 16 and npm 8 (#2157)
- change node version from 14.18.1 to 16.13.0
- change npm version from 6.14.13 to 8.1.0
- update package-lock.json to lockfileVersion 2
- use @sindresorhus/do-not-disturb instead of macos-notification-state to avoid failing CI
- run ferdi build on latest macos and windows
- skip husky in CI builds
- move 'cld' and 'node-mac-permissions' to optionalDependency
Co-authored-by: Vijay A <vraravam@users.noreply.github.com>
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/dependency-updates.yml | 12 | ||||
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 40 |
2 files changed, 26 insertions, 26 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index 407011c7c..f49c676df 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml | |||
@@ -37,21 +37,21 @@ jobs: | |||
37 | cache-name: cache-node-modules | 37 | cache-name: cache-node-modules |
38 | with: | 38 | with: |
39 | path: ${{ env.NPM_CACHE }} | 39 | path: ${{ env.NPM_CACHE }} |
40 | key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} | 40 | key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} |
41 | restore-keys: | | 41 | restore-keys: | |
42 | ${{ runner.os }}-14.18-build-${{ env.cache-name }}- | 42 | ${{ runner.os }}-16.13-build-${{ env.cache-name }}- |
43 | ${{ runner.os }}-14.18-build- | 43 | ${{ runner.os }}-16.13-build- |
44 | - name: Cache pnpm modules | 44 | - name: Cache pnpm modules |
45 | uses: actions/cache@v2 | 45 | uses: actions/cache@v2 |
46 | env: | 46 | env: |
47 | cache-name: cache-pnpm-store | 47 | cache-name: cache-pnpm-store |
48 | with: | 48 | with: |
49 | path: ${{ env.PNPM_CACHE }} | 49 | path: ${{ env.PNPM_CACHE }} |
50 | key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} | 50 | key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} |
51 | - name: Use Node.js 14.18.1 | 51 | - name: Use Node.js 16.13.0 |
52 | uses: actions/setup-node@v2 | 52 | uses: actions/setup-node@v2 |
53 | with: | 53 | with: |
54 | node-version: 14.18.1 | 54 | node-version: 16.13.0 |
55 | - name: Install pnpm | 55 | - name: Install pnpm |
56 | uses: pnpm/action-setup@v2.0.1 | 56 | uses: pnpm/action-setup@v2.0.1 |
57 | with: | 57 | with: |
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index 6bac636d5..10c2726f0 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
@@ -90,7 +90,7 @@ jobs: | |||
90 | name: 'macos ${{ github.event.inputs.message }}' | 90 | name: 'macos ${{ github.event.inputs.message }}' |
91 | needs: check_updates | 91 | needs: check_updates |
92 | if: ${{ (needs.check_updates.outputs.should_run != 'false') && (github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && (contains(github.event.inputs.message, '[macOS]') || (!contains(github.event.inputs.message, '[macOS]') && !contains(github.event.inputs.message, '[Linux]') && !contains(github.event.inputs.message, '[Windows]'))))) }} | 92 | if: ${{ (needs.check_updates.outputs.should_run != 'false') && (github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && (contains(github.event.inputs.message, '[macOS]') || (!contains(github.event.inputs.message, '[macOS]') && !contains(github.event.inputs.message, '[Linux]') && !contains(github.event.inputs.message, '[Windows]'))))) }} |
93 | runs-on: macos-11 | 93 | runs-on: macos-latest |
94 | steps: | 94 | steps: |
95 | - name: Set env vars | 95 | - name: Set env vars |
96 | run: | | 96 | run: | |
@@ -120,17 +120,17 @@ jobs: | |||
120 | cache-name: cache-node-modules | 120 | cache-name: cache-node-modules |
121 | with: | 121 | with: |
122 | path: ${{ env.NPM_CACHE }} | 122 | path: ${{ env.NPM_CACHE }} |
123 | key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} | 123 | key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} |
124 | restore-keys: | | 124 | restore-keys: | |
125 | ${{ runner.os }}-14.18-build-${{ env.cache-name }}- | 125 | ${{ runner.os }}-16.13-build-${{ env.cache-name }}- |
126 | ${{ runner.os }}-14.18-build- | 126 | ${{ runner.os }}-16.13-build- |
127 | - name: Cache pnpm modules | 127 | - name: Cache pnpm modules |
128 | uses: actions/cache@v2 | 128 | uses: actions/cache@v2 |
129 | env: | 129 | env: |
130 | cache-name: cache-pnpm-store | 130 | cache-name: cache-pnpm-store |
131 | with: | 131 | with: |
132 | path: ${{ env.PNPM_CACHE }} | 132 | path: ${{ env.PNPM_CACHE }} |
133 | key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} | 133 | key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} |
134 | - name: Cache electron modules | 134 | - name: Cache electron modules |
135 | uses: actions/cache@v2 | 135 | uses: actions/cache@v2 |
136 | env: | 136 | env: |
@@ -145,10 +145,10 @@ jobs: | |||
145 | with: | 145 | with: |
146 | key: ${{ runner.os }}-${{ env.cache-name }} | 146 | key: ${{ runner.os }}-${{ env.cache-name }} |
147 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 147 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
148 | - name: Use Node.js 14.18.1 | 148 | - name: Use Node.js 16.13.0 |
149 | uses: actions/setup-node@v2 | 149 | uses: actions/setup-node@v2 |
150 | with: | 150 | with: |
151 | node-version: 14.18.1 | 151 | node-version: 16.13.0 |
152 | - name: Install pnpm | 152 | - name: Install pnpm |
153 | uses: pnpm/action-setup@v2.0.1 | 153 | uses: pnpm/action-setup@v2.0.1 |
154 | with: | 154 | with: |
@@ -219,17 +219,17 @@ jobs: | |||
219 | cache-name: cache-node-modules | 219 | cache-name: cache-node-modules |
220 | with: | 220 | with: |
221 | path: ${{ env.NPM_CACHE }} | 221 | path: ${{ env.NPM_CACHE }} |
222 | key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} | 222 | key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} |
223 | restore-keys: | | 223 | restore-keys: | |
224 | ${{ runner.os }}-14.18-build-${{ env.cache-name }}- | 224 | ${{ runner.os }}-16.13-build-${{ env.cache-name }}- |
225 | ${{ runner.os }}-14.18-build- | 225 | ${{ runner.os }}-16.13-build- |
226 | - name: Cache pnpm modules | 226 | - name: Cache pnpm modules |
227 | uses: actions/cache@v2 | 227 | uses: actions/cache@v2 |
228 | env: | 228 | env: |
229 | cache-name: cache-pnpm-store | 229 | cache-name: cache-pnpm-store |
230 | with: | 230 | with: |
231 | path: ${{ env.PNPM_CACHE }} | 231 | path: ${{ env.PNPM_CACHE }} |
232 | key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} | 232 | key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} |
233 | - name: Cache electron modules | 233 | - name: Cache electron modules |
234 | uses: actions/cache@v2 | 234 | uses: actions/cache@v2 |
235 | env: | 235 | env: |
@@ -244,10 +244,10 @@ jobs: | |||
244 | with: | 244 | with: |
245 | key: ${{ runner.os }}-${{ env.cache-name }} | 245 | key: ${{ runner.os }}-${{ env.cache-name }} |
246 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 246 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
247 | - name: Use Node.js 14.18.1 | 247 | - name: Use Node.js 16.13.0 |
248 | uses: actions/setup-node@v2 | 248 | uses: actions/setup-node@v2 |
249 | with: | 249 | with: |
250 | node-version: 14.18.1 | 250 | node-version: 16.13.0 |
251 | - name: Install pnpm | 251 | - name: Install pnpm |
252 | uses: pnpm/action-setup@v2.0.1 | 252 | uses: pnpm/action-setup@v2.0.1 |
253 | with: | 253 | with: |
@@ -307,7 +307,7 @@ jobs: | |||
307 | name: 'windows ${{ github.event.inputs.message }}' | 307 | name: 'windows ${{ github.event.inputs.message }}' |
308 | needs: check_updates | 308 | needs: check_updates |
309 | if: ${{ (needs.check_updates.outputs.should_run != 'false') && (github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && (contains(github.event.inputs.message, '[Windows]') || (!contains(github.event.inputs.message, '[macOS]') && !contains(github.event.inputs.message, '[Linux]') && !contains(github.event.inputs.message, '[Windows]'))))) }} | 309 | if: ${{ (needs.check_updates.outputs.should_run != 'false') && (github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && (contains(github.event.inputs.message, '[Windows]') || (!contains(github.event.inputs.message, '[macOS]') && !contains(github.event.inputs.message, '[Linux]') && !contains(github.event.inputs.message, '[Windows]'))))) }} |
310 | runs-on: windows-2019 | 310 | runs-on: windows-latest |
311 | steps: | 311 | steps: |
312 | - name: Set env vars | 312 | - name: Set env vars |
313 | run: | | 313 | run: | |
@@ -339,17 +339,17 @@ jobs: | |||
339 | cache-name: cache-node-modules | 339 | cache-name: cache-node-modules |
340 | with: | 340 | with: |
341 | path: ${{ env.NPM_CACHE }} | 341 | path: ${{ env.NPM_CACHE }} |
342 | key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} | 342 | key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} |
343 | restore-keys: | | 343 | restore-keys: | |
344 | ${{ runner.os }}-14.18-build-${{ env.cache-name }}- | 344 | ${{ runner.os }}-16.13-build-${{ env.cache-name }}- |
345 | ${{ runner.os }}-14.18-build- | 345 | ${{ runner.os }}-16.13-build- |
346 | - name: Cache pnpm modules | 346 | - name: Cache pnpm modules |
347 | uses: actions/cache@v2 | 347 | uses: actions/cache@v2 |
348 | env: | 348 | env: |
349 | cache-name: cache-pnpm-store | 349 | cache-name: cache-pnpm-store |
350 | with: | 350 | with: |
351 | path: ${{ env.PNPM_CACHE }} | 351 | path: ${{ env.PNPM_CACHE }} |
352 | key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} | 352 | key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} |
353 | - name: Cache electron modules | 353 | - name: Cache electron modules |
354 | uses: actions/cache@v2 | 354 | uses: actions/cache@v2 |
355 | env: | 355 | env: |
@@ -364,10 +364,10 @@ jobs: | |||
364 | with: | 364 | with: |
365 | key: ${{ runner.os }}-${{ env.cache-name }} | 365 | key: ${{ runner.os }}-${{ env.cache-name }} |
366 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 366 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
367 | - name: Use Node.js 14.18.1 | 367 | - name: Use Node.js 16.13.0 |
368 | uses: actions/setup-node@v2 | 368 | uses: actions/setup-node@v2 |
369 | with: | 369 | with: |
370 | node-version: 14.18.1 | 370 | node-version: 16.13.0 |
371 | - name: Install pnpm | 371 | - name: Install pnpm |
372 | uses: pnpm/action-setup@v2.0.1 | 372 | uses: pnpm/action-setup@v2.0.1 |
373 | with: | 373 | with: |