Skip to content

Commit

Permalink
Bump Dependencies (#1560)
Browse files Browse the repository at this point in the history
* Bump Dependencies

* Bump minimum node version to 16

* CI: Bump create-pull-request to v5

* Fix electron-packager to not include linux ia32

waiting for new electron-packager release which includes electron/packager#1449

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: campersau <[email protected]>
  • Loading branch information
github-actions[bot] and campersau committed Jun 29, 2023
1 parent 9c719c1 commit be59365
Show file tree
Hide file tree
Showing 7 changed files with 1,599 additions and 578 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- run: npm install

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.GITHUB_TOKEN }}
author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: ['14', '16', '18']
node-version: ['16', '18', '20']
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
# env:
Expand All @@ -25,17 +25,17 @@ jobs:

# linux dependencies
- run: sudo apt update && sudo apt install -y wine64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
- run: wine --version
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
- run: sudo add-apt-repository ppa:git-core/ppa -y && sudo apt-get update -q && sudo apt-get install -y git
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '*'
# macos dependencies
# required for electron-packager
# - run: brew update && brew cask install xquartz wine-stable
# if: matrix.os == 'macos-latest' && matrix.node-version == '14'
# if: matrix.os == 'macos-latest' && matrix.node-version == '16'
# - run: wine64 --version
# if: matrix.os == 'macos-latest' && matrix.node-version == '14'
# if: matrix.os == 'macos-latest' && matrix.node-version == '16'
- run: brew reinstall git
if: matrix.os == 'macos-latest' && matrix.node-version == '*'
# windows dependencies
Expand All @@ -52,92 +52,92 @@ jobs:

- run: npm ci
- run: npm run lint
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
- run: npm run build
- run: npm test

# publish artifacts
- run: npm pack
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
- run: npm run electronpackage -- --all
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
- run: npm run electronzip
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'

- name: Upload npm pack
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit
path: ungit-*.tgz
retention-days: 7

- name: Upload ungit-darwin-arm64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit-darwin-arm64
path: dist/ungit-darwin-arm64.zip
retention-days: 7

- name: Upload ungit-darwin-x64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit-darwin-x64
path: dist/ungit-darwin-x64.zip
retention-days: 7

- name: Upload ungit-linux-arm64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit-linux-arm64
path: dist/ungit-linux-arm64.zip
retention-days: 7

- name: Upload ungit-linux-armv7l
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit-linux-armv7l
path: dist/ungit-linux-armv7l.zip
retention-days: 7

- name: Upload ungit-linux-x64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit-linux-x64
path: dist/ungit-linux-x64.zip
retention-days: 7

- name: Upload ungit-win32-arm64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit-win32-arm64
path: dist/ungit-win32-arm64.zip
retention-days: 7

- name: Upload ungit-win32-ia32
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit-win32-ia32
path: dist/ungit-win32-ia32.zip
retention-days: 7

- name: Upload ungit-win32-x64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16'
uses: actions/upload-artifact@v3
with:
name: ungit-win32-x64
path: dist/ungit-win32-x64.zip
retention-days: 7

- name: npm publish
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14' && github.repository == 'FredrikNoren/ungit' && github.ref == 'refs/heads/master'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' && github.repository == 'FredrikNoren/ungit' && github.ref == 'refs/heads/master'
uses: actions/github-script@v6
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Quick intro to ungit: [https://youtu.be/hkBVAi3oKvo](https://youtu.be/hkBVAi3oKv

Installing
----------
Requires [node.js](https://nodejs.org) (≥ 14), [npm](https://www.npmjs.com/) (≥ 6.14.16, comes with node.js) and [git](https://git-scm.com/) (≥ 2.34.x). To install ungit just type:
Requires [node.js](https://nodejs.org) (≥ 16), [npm](https://www.npmjs.com/) (≥ 8.19.4, comes with node.js) and [git](https://git-scm.com/) (≥ 2.34.x). To install ungit just type:

npm install -g ungit

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ image: Visual Studio 2022
environment:
matrix:
- nodejs_version: '' # latest
- nodejs_version: '18'
- nodejs_version: '16'
- nodejs_version: '14'

branches:
only:
Expand Down
Loading

0 comments on commit be59365

Please sign in to comment.