diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index c85c95b76..daf07e1ff 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -27,24 +27,18 @@ jobs: # we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase - name: Install node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: '16.13.0' + node-version-file: '.nvmrc' - name: Cache Desktop node_modules id: cache-desktop-modules - uses: actions/cache@v2 + uses: actions/cache@v3 if: runner.os != 'Windows' with: path: node_modules key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} - - name: Chocolatey Install Action - if: runner.os == 'Windows' - uses: crazy-max/ghaction-chocolatey@v1.4.2 - with: - args: install python2 -y - # Not having this will break the windows build because the PATH won't be set by msbuild. - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.3.1 @@ -54,7 +48,6 @@ jobs: if: runner.os == 'Windows' run: | npm install --global node-gyp@latest - npm config set python python2.7 npm config set msvs_version 2022 - name: Install Desktop node_modules diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d6b9c1405..8ad02ccd3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,9 +24,9 @@ jobs: # we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase - name: Install node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: '16.13.0' + node-version-file: '.nvmrc' - name: Cache Desktop node_modules id: cache-desktop-modules @@ -35,12 +35,6 @@ jobs: path: node_modules key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} - - name: Chocolatey Install Action - if: runner.os == 'Windows' - uses: crazy-max/ghaction-chocolatey@v1.4.2 - with: - args: install python2 -y - #Not having this will break the windows build because the PATH won't be set by msbuild. - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.3.1 @@ -50,7 +44,6 @@ jobs: if: runner.os == 'Windows' run: | npm install --global node-gyp@latest - npm config set python python2.7 npm config set msvs_version 2022 - name: Install Desktop node_modules diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1e83298cc..1c59a350d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: # we stay on v2 even if there is a v3 because the v3 logic is less flexible for our usecase - name: Install node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: '16.13.0' + node-version-file: '.nvmrc' - name: Cache Desktop node_modules id: cache-desktop-modules @@ -36,12 +36,6 @@ jobs: path: node_modules key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} - - name: Chocolatey Install Action - if: runner.os == 'Windows' - uses: crazy-max/ghaction-chocolatey@v1.4.2 - with: - args: install python2 -y - #Not having this will break the windows build because the PATH won't be set by msbuild. - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.3.1 @@ -51,7 +45,6 @@ jobs: if: runner.os == 'Windows' run: | npm install --global node-gyp@latest - npm config set python python2.7 npm config set msvs_version 2022 - name: Install Desktop node_modules