Skip to content

Commit c4ee4a9

Browse files
committed
0.4.18
1 parent 5cdda76 commit c4ee4a9

File tree

3 files changed

+39
-23
lines changed

3 files changed

+39
-23
lines changed

.github/workflows/build-deploy.yml

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,44 +21,48 @@ jobs:
2121
runs-on: ubuntu-latest
2222
container: tonsky/jwm:latest
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- run: bash -c 'source /etc/profile && python3 script/build.py --only native'
26-
- uses: actions/upload-artifact@v3
26+
- uses: actions/upload-artifact@v4
2727
with:
28-
name: native
28+
name: native-linux
2929
path: linux/build/libjwm_x64.so
3030

3131
build_windows:
3232
runs-on: windows-latest
3333
steps:
34-
- uses: actions/checkout@v3
35-
- uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
34+
- uses: actions/checkout@v4
35+
- uses: seanmiddleditch/gha-setup-ninja@master
3636
- run: |
37-
echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
38-
echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
37+
echo "JAVA_HOME=$JAVA_HOME_21_X64" >> $GITHUB_ENV
38+
echo "$JAVA_HOME_21_X64/bin" >> $GITHUB_PATH
3939
shell: bash
4040
- uses: ilammy/msvc-dev-cmd@v1
4141
with:
4242
arch: amd64
4343
- run: python3 script/build.py --only native
44-
- uses: actions/upload-artifact@v3
44+
- uses: actions/upload-artifact@v4
4545
with:
46-
name: native
46+
name: native-windows
4747
path: windows/build/jwm_x64.dll
4848

4949
build_macos:
50-
runs-on: macos-11
50+
runs-on: macos-latest
5151
steps:
52-
- uses: actions/checkout@v3
53-
- uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
52+
- uses: actions/checkout@v4
53+
- uses: seanmiddleditch/gha-setup-ninja@master
5454
- run: |
55-
echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
56-
echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
55+
echo "JAVA_HOME=$JAVA_HOME_21_X64" >> $GITHUB_ENV
56+
echo "$JAVA_HOME_21_X64/bin" >> $GITHUB_PATH
57+
- run: |
58+
echo $JAVA_HOME
59+
ls -lah $JAVA_HOME/include
60+
ls -lah $JAVA_HOME/include/darwin
5761
- run: python3 script/build.py --arch=x64 --only native
5862
- run: python3 script/build.py --arch=arm64 --only native
59-
- uses: actions/upload-artifact@v3
63+
- uses: actions/upload-artifact@v4
6064
with:
61-
name: native
65+
name: native-macos
6266
path: |
6367
macos/build/libjwm_x64.dylib
6468
macos/build/libjwm_arm64.dylib
@@ -67,17 +71,18 @@ jobs:
6771
runs-on: ubuntu-latest
6872
needs: [build_linux, build_windows, build_macos]
6973
steps:
70-
- uses: actions/checkout@v3
74+
- uses: actions/checkout@v4
7175
- run: |
72-
echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
73-
echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
76+
echo "JAVA_HOME=$JAVA_HOME_21_X64" >> $GITHUB_ENV
77+
echo "$JAVA_HOME_21_X64/bin" >> $GITHUB_PATH
7478
- run: python3 script/build.py --only java
75-
- uses: actions/download-artifact@v3
79+
- uses: actions/download-artifact@v4
7680
with:
77-
name: native
81+
pattern: native-*
7882
path: target/classes
83+
merge-multiple: true
7984
- run: python3 script/package.py --only java --ref ${{ github.ref }}
80-
- uses: actions/upload-artifact@v3
85+
- uses: actions/upload-artifact@v4
8186
with:
8287
name: jars
8388
path: |

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ docs/apidocs
99
.idea
1010

1111
# clion build directories
12-
/*build*
12+
# /*build*
1313
/macos/cmake-build-debug
1414

1515
# jvm crash logs

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# 0.4.18 - Jul 9, 2024
2+
3+
- macOS: Stable screen ids
4+
- macOS: Do not stop CVDisplayLink, improves frame pacing
5+
6+
# 0.4.17 - Jan 16, 2024
7+
8+
- X11: add KeyLocation, additional keys via @dzaima
9+
- X11: fix i3 workspace switching #283 via @bulby
10+
- macOS: Fix fullscreen
11+
112
# 0.4.16 - Dec 1, 2023
213

314
Added:

0 commit comments

Comments
 (0)