Merge remote-tracking branch 'origin/develop'

nut-tree · Feb 18, 2024 · 2c19ded · 2c19ded
2 parents 39dd098 + 0cc2e17
commit 2c19ded
Show file tree

Hide file tree

Showing 10 changed files with 733 additions and 404 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,13 +11,13 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-11, windows-2019 ]
-        node: [ 16 ]
+        node: [ 18 ]
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
       - name: Set up node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4.0.2
         with:
           node-version: ${{matrix.node}}
       - name: Configure Linux environment

diff --git a/.github/workflows/snapshot_release.yaml b/.github/workflows/snapshot_release.yaml
@@ -15,12 +15,13 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-11, windows-2019 ]
+        node: [ 18 ]
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
       - name: Set up node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4.0.2
         with:
           node-version: ${{matrix.node}}
       - name: Configure Linux environment
@@ -50,11 +51,11 @@ jobs:
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
       - name: Set up node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4.0.2
         with:
-          node-version: 14
+          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
@@ -82,5 +83,5 @@ jobs:
         uses: peter-evans/repository-dispatch@v1
         with:
           token: ${{ secrets.SNAPSHOT_DISPATCH_TOKEN }}
-          repository: nut-tree/libnut-install
+          repository: nut-tree/nut.js
           event-type: snapshot-release
diff --git a/.github/workflows/tagged_release.yaml b/.github/workflows/tagged_release.yaml
@@ -9,12 +9,13 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-11, windows-2019 ]
+        node: [ 18 ]
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
       - name: Set up node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4.0.2
         with:
           node-version: ${{matrix.node}}
       - name: Configure Linux environment
@@ -44,11 +45,11 @@ jobs:
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
       - name: Set up node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4.0.2
         with:
-          node-version: 14
+          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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+# 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.
+
 ## 2.6.0
 
 - Feature: Move/focus/resize window [(#18)](/~https://github.com/nut-tree/libnut-core/issues/18) Contributed by [@ekrenzin](/~https://github.com/ekrenzin)