Address review comments

This splits the Linux workflow and build script into linux and linux-arm64.
This commit is contained in:
TGP17
2023-10-02 16:30:53 +02:00
committed by GitHub
parent 6a06833ff1
commit aa681d2c0f
5 changed files with 63 additions and 40 deletions

21
.ci/linux-arm64.sh Executable file
View File

@@ -0,0 +1,21 @@
#!/bin/sh -ex
mkdir build && cd build
cmake .. -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-11 \
-DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-11 \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DENABLE_ASM=OFF \
-DENABLE_QT_TRANSLATION=ON \
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DCITRA_ENABLE_BUNDLE_TARGET=OFF \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DUSE_DISCORD_PRESENCE=ON
ninja
DESTDIR="$PWD/AppDir" ninja install
7z a AppDir.7z AppDir
mkdir bundle
mv AppDir.7z ./bundle

View File

@@ -1,28 +1,5 @@
#!/bin/sh -ex
if [ "$TARGET" = "arm64-appimage" ]; then
mkdir build && cd build
CC=aarch64-linux-gnu-gcc-11 CXX=aarch64-linux-gnu-g++-11 cmake .. -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DENABLE_ASM=OFF \
-DENABLE_QT_TRANSLATION=ON \
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DCITRA_ENABLE_BUNDLE_TARGET=OFF \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DUSE_DISCORD_PRESENCE=ON
ninja
DESTDIR="$PWD/AppDir" ninja install
mv ./AppDir/usr/local/* ./AppDir/usr
rm -rf ./AppDir/usr/local
sed -e s/PrefersNonDefaultGPU=true//g -i ./AppDir/usr/share/applications/citra-qt.desktop
7z a AppDir.7z AppDir
mkdir bundle
mv AppDir.7z ./bundle
else
mkdir build && cd build
cmake .. -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
@@ -34,11 +11,10 @@ cmake .. -G Ninja \
-DUSE_DISCORD_PRESENCE=ON
ninja
if [ "$TARGET" = "appimage" ]; then
if [ "$TARGET" = "appimage" ]; then
ninja bundle
fi
fi
ccache -s
ctest -VV -C Release
fi