Skip to content

Commit 58c6330

Browse files
committed
update actions
1 parent d5229d0 commit 58c6330

File tree

1 file changed

+19
-29
lines changed

1 file changed

+19
-29
lines changed

.github/workflows/build.yml

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
windows:
66
runs-on: windows-2022
77
steps:
8-
- uses: actions/checkout@v3
8+
- uses: actions/checkout@v4
99
- name: install dependencies
1010
shell: bash
1111
run: |
@@ -24,12 +24,10 @@ jobs:
2424
shell: bash
2525
run: |
2626
set -e -x
27-
mkdir -p build/windows-x86
28-
cd build/windows-x86
2927
# cmake isn't smart enough to find jawt of the correct arch
30-
cmake ../../ -A Win32 -DJAVA_JVM_LIBRARY=../../jdks/x86/lib/jvm.lib -DJAVA_AWT_LIBRARY=../../jdks/x86/lib/jawt.lib
31-
cmake --build . --config Release
32-
- uses: actions/upload-artifact@v3
28+
cmake -B build/windows-x86 -A Win32 -DJAVA_JVM_LIBRARY=jdks/x86/lib/jvm.lib -DJAVA_AWT_LIBRARY=jdks/x86/lib/jawt.lib .
29+
cmake --build build/windows-x86 --config Release
30+
- uses: actions/upload-artifact@v4
3331
with:
3432
name: windows-x86
3533
path: build/windows-x86/Release/rlawt.dll
@@ -39,11 +37,9 @@ jobs:
3937
shell: bash
4038
run: |
4139
set -e -x
42-
mkdir -p build/windows-amd64
43-
cd build/windows-amd64
44-
cmake ../../
45-
cmake --build . --config Release
46-
- uses: actions/upload-artifact@v3
40+
cmake -B build/windows-amd64 .
41+
cmake --build build/windows-amd64 --config Release
42+
- uses: actions/upload-artifact@v4
4743
with:
4844
name: windows-amd64
4945
path: build/windows-amd64/Release/rlawt.dll
@@ -53,10 +49,8 @@ jobs:
5349
shell: bash
5450
run: |
5551
set -e -x
56-
mkdir -p build/windows-aarch64
57-
cd build/windows-aarch64
58-
cmake ../../ -A ARM64 -DJAVA_JVM_LIBRARY=../../jdks/aarch64/lib/jvm.lib -DJAVA_AWT_LIBRARY=../../jdks/aarch64/lib/jawt.lib
59-
cmake --build . --config Release
52+
cmake -B build/windows-aarch64 -A ARM64 -DJAVA_JVM_LIBRARY=jdks/aarch64/lib/jvm.lib -DJAVA_AWT_LIBRARY=jdks/aarch64/lib/jawt.lib .
53+
cmake --build build/windows-aarch64 --config Release
6054
- uses: actions/upload-artifact@v3
6155
with:
6256
name: windows-aarch64
@@ -66,7 +60,7 @@ jobs:
6660
macos:
6761
runs-on: macos-11
6862
steps:
69-
- uses: actions/checkout@v3
63+
- uses: actions/checkout@v4
7064
- name: install dependencies
7165
run: |
7266
set -e -x
@@ -76,11 +70,9 @@ jobs:
7670
- name: build macos-x86_64
7771
run: |
7872
set -e -x
79-
mkdir -p build/macos-x86_64
80-
cd build/macos-x86_64
81-
cmake ../../ -DCMAKE_OSX_ARCHITECTURES=x86_64
82-
cmake --build . --config Release
83-
- uses: actions/upload-artifact@v3
73+
cmake -B build/macos-x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64 .
74+
cmake --build build/macos-x86_64 --config Release
75+
- uses: actions/upload-artifact@v4
8476
with:
8577
name: macos-x86_64
8678
path: build/macos-x86_64/librlawt.dylib
@@ -89,11 +81,9 @@ jobs:
8981
- name: build macos-aarch64
9082
run: |
9183
set -e -x
92-
mkdir -p build/macos-aarch64
93-
cd build/macos-aarch64
94-
cmake ../../ -DCMAKE_OSX_ARCHITECTURES=arm64 -DJAVA_JVM_LIBRARY=../../jdk-11.0.15+10/Contents/Home/lib/server/libjvm.dylib -DJAVA_AWT_LIBRARY=../../jdk-11.0.15+10/Contents/Home/lib/libjawt.dylib
95-
cmake --build . --config Release
96-
- uses: actions/upload-artifact@v3
84+
cmake -B build/macos-aarch64 -DCMAKE_OSX_ARCHITECTURES=arm64 -DJAVA_JVM_LIBRARY=jdk-11.0.15+10/Contents/Home/lib/server/libjvm.dylib -DJAVA_AWT_LIBRARY=jdk-11.0.15+10/Contents/Home/lib/libjawt.dylib .
85+
cmake --build build/macos-aarch64 --config Release
86+
- uses: actions/upload-artifact@v4
9787
with:
9888
name: macos-aarch64
9989
path: build/macos-aarch64/librlawt.dylib
@@ -105,7 +95,7 @@ jobs:
10595
container:
10696
image: amd64/centos:7.9.2009
10797
steps:
108-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v4
10999
- name: install dependencies
110100
run: |
111101
set -e -x
@@ -114,7 +104,7 @@ jobs:
114104
tar -xf cmake-3.23.2-linux-x86_64.tar.gz
115105
mv cmake-3.23.2-linux-x86_64 cmake
116106
yum -y install libX11-devel mesa-libGL-devel java-11-openjdk-devel "@Development Tools"
117-
- uses: actions/download-artifact@v3
107+
- uses: actions/download-artifact@v4
118108
with:
119109
path: jar/net/runelite/rlawt/
120110
- name: build linux-amd64
@@ -132,7 +122,7 @@ jobs:
132122
run: |
133123
set -e -x
134124
jar cvf rlawt.jar -C jar/ .
135-
- uses: actions/upload-artifact@v3
125+
- uses: actions/upload-artifact@v4
136126
with:
137127
name: jar
138128
path: rlawt.jar

0 commit comments

Comments
 (0)