Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

node 16 #1476

Merged
merged 1 commit into from
Apr 30, 2021
Merged

node 16 #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: ['10', '12', '14', '15']
node-version: ['12', '14', '16']
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
# env:
Expand Down Expand Up @@ -59,86 +59,86 @@ jobs:

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

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

- name: Upload ungit-darwin-arm64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
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 == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
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 == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
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 == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
with:
name: ungit-linux-armv7l
path: dist/ungit-linux-armv7l.zip
retention-days: 7

- name: Upload ungit-linux-ia32
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
with:
name: ungit-linux-ia32
path: dist/ungit-linux-ia32.zip
retention-days: 7

- name: Upload ungit-linux-x64
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
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 == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
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 == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
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 == '10'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12'
uses: actions/upload-artifact@v2
with:
name: ungit-win32-x64
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ os:
language: node_js
node_js:
- node
- '16'
- '14'
- '12'
- '10'
branches:
only:
- master
Expand All @@ -18,12 +18,12 @@ env:
- GIT_VERSION=default
jobs:
exclude:
- node_js: '16'
env: GIT_VERSION=edge
- node_js: '14'
env: GIT_VERSION=edge
- node_js: '12'
env: GIT_VERSION=edge
- node_js: '10'
env: GIT_VERSION=edge
- os: windows
env: GIT_VERSION=edge
addons:
Expand Down Expand Up @@ -73,4 +73,4 @@ deploy:
release_notes: "[Changelog](https://github.com/FredrikNoren/ungit/blob/master/CHANGELOG.md#${TRAVIS_TAG//[v\\.]})"
on:
tags: true
condition: $TRAVIS_OS_NAME = "linux" && $TRAVIS_NODE_VERSION = "10"
condition: $TRAVIS_OS_NAME = "linux" && $TRAVIS_NODE_VERSION = "12"
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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) (≥ 10.18.0), [npm](https://www.npmjs.com/) (≥ 6.13.4, comes with node.js) and [git](https://git-scm.com/) (≥ 1.8.x). To install ungit just type:
Requires [node.js](https://nodejs.org) (≥ 12), [npm](https://www.npmjs.com/) (≥ 6.14.12, comes with node.js) and [git](https://git-scm.com/) (≥ 1.8.x). To install ungit just type:

npm install -g ungit

Expand Down
9 changes: 7 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@ skip_branch_with_pr: true
environment:
matrix:
- nodejs_version: '' # latest
- nodejs_version: '16'
- nodejs_version: '14'
- nodejs_version: '12'
- nodejs_version: '10'

branches:
only:
- master

install:
- ps: Install-Product node $env:nodejs_version
- ps: |
try {
Install-Product node $env:nodejs_version
} catch {
Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
}
- node --version
- npm --version
- npm ci
Expand Down