diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml index 5e59b6999..c4e095fe0 100644 --- a/.github/workflows/bump.yml +++ b/.github/workflows/bump.yml @@ -19,7 +19,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v3 with: - node-version: '16' + node-version: '18' - run: npm ci - run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 613584392..72f774b0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: ['16', '18', '20'] + node-version: ['18', '20', '21'] os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} # env: @@ -25,25 +25,25 @@ jobs: # linux dependencies - run: sudo apt update && sudo apt install -y wine64 - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' - run: wine --version - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' - 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 == '*' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '21' # macos dependencies # required for electron-packager # - run: brew update && brew cask install xquartz wine-stable -# if: matrix.os == 'macos-latest' && matrix.node-version == '16' +# if: matrix.os == 'macos-latest' && matrix.node-version == '18' # - run: wine64 --version -# if: matrix.os == 'macos-latest' && matrix.node-version == '16' +# if: matrix.os == 'macos-latest' && matrix.node-version == '18' - run: brew reinstall git - if: matrix.os == 'macos-latest' && matrix.node-version == '*' + if: matrix.os == 'macos-latest' && matrix.node-version == '21' # windows dependencies # https://github.community/t5/GitHub-Actions/TEMP-is-broken-on-Windows/td-p/30432 - run: echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV if: matrix.os == 'windows-latest' - run: choco upgrade git - if: matrix.os == 'windows-latest' && matrix.node-version == '*' + if: matrix.os == 'windows-latest' && matrix.node-version == '21' - run: git --version - run: git config --global user.email "test@testy.com" @@ -52,20 +52,20 @@ jobs: - run: npm ci - run: npm run lint - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' - run: npm run build - run: npm test # publish artifacts - run: npm pack - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' - run: npm run electronpackage -- --all - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' - run: npm run electronzip - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' - name: Upload npm pack - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit @@ -73,7 +73,7 @@ jobs: retention-days: 7 - name: Upload ungit-darwin-arm64 - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit-darwin-arm64 @@ -81,7 +81,7 @@ jobs: retention-days: 7 - name: Upload ungit-darwin-x64 - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit-darwin-x64 @@ -89,7 +89,7 @@ jobs: retention-days: 7 - name: Upload ungit-linux-arm64 - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit-linux-arm64 @@ -97,7 +97,7 @@ jobs: retention-days: 7 - name: Upload ungit-linux-armv7l - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit-linux-armv7l @@ -105,7 +105,7 @@ jobs: retention-days: 7 - name: Upload ungit-linux-x64 - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit-linux-x64 @@ -113,7 +113,7 @@ jobs: retention-days: 7 - name: Upload ungit-win32-arm64 - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit-win32-arm64 @@ -121,7 +121,7 @@ jobs: retention-days: 7 - name: Upload ungit-win32-ia32 - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit-win32-ia32 @@ -129,7 +129,7 @@ jobs: retention-days: 7 - name: Upload ungit-win32-x64 - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' uses: actions/upload-artifact@v3 with: name: ungit-win32-x64 @@ -137,7 +137,7 @@ jobs: retention-days: 7 - name: npm publish - if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16' && github.repository == 'FredrikNoren/ungit' && github.ref == 'refs/heads/master' + if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18' && github.repository == 'FredrikNoren/ungit' && github.ref == 'refs/heads/master' uses: actions/github-script@v6 env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/README.md b/README.md index d00a19a63..ba327b2da 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Quick intro to ungit: [https://youtu.be/hkBVAi3oKvo](https://youtu.be/hkBVAi3oKv Installing ---------- -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: +Requires [node.js](https://nodejs.org) (≥ 18), [npm](https://www.npmjs.com/) (≥ 9.8.1, comes with node.js) and [git](https://git-scm.com/) (≥ 2.34.x). To install ungit just type: npm install -g ungit diff --git a/appveyor.yml b/appveyor.yml index 0d55bbcab..b909b5338 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,8 +4,8 @@ image: Visual Studio 2022 environment: matrix: - nodejs_version: '' # latest + - nodejs_version: '20' - nodejs_version: '18' - - nodejs_version: '16' branches: only: diff --git a/package-lock.json b/package-lock.json index 3f8d93756..eaf1c92d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -82,7 +82,7 @@ "supertest": "~6.3.3" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index ff010fcdb..d4f2821cb 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "supertest": "~6.3.3" }, "engines": { - "node": ">=16" + "node": ">=18" }, "license": "MIT", "main": "public/main.js"