Skip to content

Commit a06ecd7

Browse files
committed
fix: use new build for ares with cmake
1 parent 0e66ebd commit a06ecd7

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

.github/workflows/release.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,34 @@ jobs:
1818
run: |
1919
sudo apt-get update
2020
sudo apt-get upgrade -y
21-
sudo apt-get install -y g++ make pkg-config libgtk-3-dev libcanberra-gtk-module libcanberra-gtk3-module libgl-dev libasound2-dev libao-dev libopenal-dev libsdl2-dev libsdl2-2.0-0 git wget file gpg appstream libfuse2t64 pkgconf dpkg-dev
21+
sudo apt-get install -y build-essential cmake pkg-config curl git clang ninja-build ccache
22+
sudo apt-get install -y wget file gpg appstream libfuse2t64 pkgconf
23+
sudo apt-get install -y libgtk-3-dev libcanberra-gtk-module libgl-dev libasound2-dev libao-dev libopenal-dev libsdl2-dev libpulse-dev libudev-dev
2224
2325
- name: Build ares
2426
run: |
25-
git clone -b $MAJOR_VERSION https://github.com/ares-emulator/ares
27+
git clone https://github.com/ares-emulator/ares
2628
cd ares
2729
mkdir -p AppDir/usr
28-
make clean
29-
make -j$(nproc) install build=release hiro=gtk3 local=false platform=linux prefix=../AppDir/usr
30+
mkdir build && cd build
31+
cmake .. -G Ninja
32+
cmake --build . -j$(nproc)
33+
cmake --install . --prefix ../AppDir/usr
3034
3135
- name: Build appimage
3236
run: |
37+
export LINUXDEPLOY_OUTPUT_VERSION="${MAJOR_VERSION}"
38+
export LD_LIBRARY_PATH=AppDir/usr/lib
39+
export DEPLOY_GTK_VERSION=3
3340
cp linuxdeploy-x86_64.AppImage ares/
3441
cd ares
3542
wget https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh
36-
wget https://github.com/darealshinji/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt.sh
37-
chmod +x linuxdeploy-plugin-gtk.sh linuxdeploy-plugin-checkrt.sh linuxdeploy-x86_64.AppImage
38-
export LINUXDEPLOY_OUTPUT_VERSION="${MAJOR_VERSION}"
39-
export LD_LIBRARY_PATH=AppDir/usr/lib
43+
chmod +x linuxdeploy-plugin-gtk.sh linuxdeploy-x86_64.AppImage
4044
mkdir -p AppDir/usr/share/metainfo
4145
cp ../net.ares.emu.appdata.xml AppDir/usr/share/metainfo/
4246
cp desktop-ui/resource/ares.desktop desktop-ui/resource/net.ares.emu.desktop
4347
mkdir -p AppDir/usr/lib
44-
./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir --plugin gtk --plugin checkrt --output appimage --desktop-file desktop-ui/resource/net.ares.emu.desktop --icon-file desktop-ui/resource/ares.png
48+
./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir --plugin gtk --output appimage --desktop-file desktop-ui/resource/net.ares.emu.desktop --icon-file desktop-ui/resource/ares.png
4549
4650
- name: release
4751
uses: "marvinpinto/action-automatic-releases@latest"

0 commit comments

Comments
 (0)