Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
s1hofmann committed Feb 19, 2024
2 parents 2c19ded + 3a02763 commit 33179d5
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 45 deletions.
22 changes: 1 addition & 21 deletions .github/workflows/snapshot_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
default: 'Snapshot release'

jobs:
test:
deploy:
strategy:
matrix:
os: [ ubuntu-20.04, macos-11, windows-2019 ]
Expand Down Expand Up @@ -41,26 +41,6 @@ jobs:
with:
working-directory: ./test/window-integration-tests
run: npm cit

deploy:
needs:
- test
strategy:
matrix:
os: [ ubuntu-20.04, macos-11, windows-2019 ]
runs-on: ${{matrix.os}}
steps:
- name: Set up Git repository
uses: actions/checkout@v4.1.1
- name: Set up node
uses: actions/setup-node@v4.0.2
with:
node-version: 18
- name: Configure Linux environment
if: ${{matrix.os == 'ubuntu-20.04'}}
run: sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev build-essential
- name: Install
run: npm run patch && npm i
- name: Publish snapshot release
if: ${{matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11'}}
run: ./.build/pre-release.sh
Expand Down
22 changes: 1 addition & 21 deletions .github/workflows/tagged_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- v*.*.*

jobs:
test:
deploy:
strategy:
matrix:
os: [ ubuntu-20.04, macos-11, windows-2019 ]
Expand Down Expand Up @@ -35,26 +35,6 @@ jobs:
with:
working-directory: ./test/window-integration-tests
run: npm cit

deploy:
needs:
- test
strategy:
matrix:
os: [ ubuntu-20.04, macos-11, windows-2019 ]
runs-on: ${{matrix.os}}
steps:
- name: Set up Git repository
uses: actions/checkout@v4.1.1
- name: Set up node
uses: actions/setup-node@v4.0.2
with:
node-version: 18
- name: Configure Linux environment
if: ${{matrix.os == 'ubuntu-20.04'}}
run: sudo apt-get install -y cmake libx11-dev zlib1g-dev libpng-dev libxtst-dev build-essential
- name: Install
run: npm run patch && npm i
- name: Publish tagged release
uses: JS-DevTools/npm-publish@v1
with:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

All notable changes to this project will be documented in this file.

# 2.7.1

- Bugfix: Re-build broken Windows release

# 2.7.0

- Enhancement: Adding support for numpad 'Enter' key [PR #168)](https://github.com/nut-tree/libnut-core/pull/168) Contributed by [@smithkyle](https://github.com/smithkyle)
- Enhancement: Adding support for 'Fn' modifier key [PR #169)](https://github.com/nut-tree/libnut-core/pull/169) Contributed by [@smithkyle](https://github.com/smithkyle)
- Maintenance: Version upgrades, CI updates, etc.
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "libnut",
"version": "2.7.0",
"version": "2.7.1",
"description": "libnut is an N-API module for desktop automation with node",
"main": "index.js",
"typings": "index.d.ts",
Expand Down

0 comments on commit 33179d5

Please sign in to comment.