From 0848eb8ddf6cfd32f6e96aac0ff592ad978c13bd Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Thu, 28 Oct 2021 19:28:42 +0200 Subject: 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 --- .github/workflows/dependency-updates.yml | 12 +++++----- .github/workflows/ferdi-builds.yml | 40 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to '.github/workflows') 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: cache-name: cache-node-modules with: path: ${{ env.NPM_CACHE }} - key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-14.18-build-${{ env.cache-name }}- - ${{ runner.os }}-14.18-build- + ${{ runner.os }}-16.13-build-${{ env.cache-name }}- + ${{ runner.os }}-16.13-build- - name: Cache pnpm modules uses: actions/cache@v2 env: cache-name: cache-pnpm-store with: path: ${{ env.PNPM_CACHE }} - key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} - - name: Use Node.js 14.18.1 + key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 with: - node-version: 14.18.1 + node-version: 16.13.0 - name: Install pnpm uses: pnpm/action-setup@v2.0.1 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: name: 'macos ${{ github.event.inputs.message }}' needs: check_updates 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]'))))) }} - runs-on: macos-11 + runs-on: macos-latest steps: - name: Set env vars run: | @@ -120,17 +120,17 @@ jobs: cache-name: cache-node-modules with: path: ${{ env.NPM_CACHE }} - key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-14.18-build-${{ env.cache-name }}- - ${{ runner.os }}-14.18-build- + ${{ runner.os }}-16.13-build-${{ env.cache-name }}- + ${{ runner.os }}-16.13-build- - name: Cache pnpm modules uses: actions/cache@v2 env: cache-name: cache-pnpm-store with: path: ${{ env.PNPM_CACHE }} - key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} + key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} - name: Cache electron modules uses: actions/cache@v2 env: @@ -145,10 +145,10 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js 14.18.1 + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 with: - node-version: 14.18.1 + node-version: 16.13.0 - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: @@ -219,17 +219,17 @@ jobs: cache-name: cache-node-modules with: path: ${{ env.NPM_CACHE }} - key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-14.18-build-${{ env.cache-name }}- - ${{ runner.os }}-14.18-build- + ${{ runner.os }}-16.13-build-${{ env.cache-name }}- + ${{ runner.os }}-16.13-build- - name: Cache pnpm modules uses: actions/cache@v2 env: cache-name: cache-pnpm-store with: path: ${{ env.PNPM_CACHE }} - key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} + key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} - name: Cache electron modules uses: actions/cache@v2 env: @@ -244,10 +244,10 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js 14.18.1 + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 with: - node-version: 14.18.1 + node-version: 16.13.0 - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: @@ -307,7 +307,7 @@ jobs: name: 'windows ${{ github.event.inputs.message }}' needs: check_updates 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]'))))) }} - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Set env vars run: | @@ -339,17 +339,17 @@ jobs: cache-name: cache-node-modules with: path: ${{ env.NPM_CACHE }} - key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} restore-keys: | - ${{ runner.os }}-14.18-build-${{ env.cache-name }}- - ${{ runner.os }}-14.18-build- + ${{ runner.os }}-16.13-build-${{ env.cache-name }}- + ${{ runner.os }}-16.13-build- - name: Cache pnpm modules uses: actions/cache@v2 env: cache-name: cache-pnpm-store with: path: ${{ env.PNPM_CACHE }} - key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} + key: ${{ runner.os }}-16.13-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }} - name: Cache electron modules uses: actions/cache@v2 env: @@ -364,10 +364,10 @@ jobs: with: key: ${{ runner.os }}-${{ env.cache-name }} path: ${{ env.ELECTRON_BUILDER_CACHE }} - - name: Use Node.js 14.18.1 + - name: Use Node.js 16.13.0 uses: actions/setup-node@v2 with: - node-version: 14.18.1 + node-version: 16.13.0 - name: Install pnpm uses: pnpm/action-setup@v2.0.1 with: -- cgit v1.2.3-54-g00ecf