Remove conflicting libs

This commit is contained in:
dcvz 2024-06-10 11:01:53 +02:00
parent e7d10a5470
commit 1ce6c5439d
2 changed files with 6 additions and 11 deletions

View File

@ -14,7 +14,6 @@ fi
curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$LINUX_DEPLOY_ARCH.AppImage" curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$LINUX_DEPLOY_ARCH.AppImage"
curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/raw/master/linuxdeploy-plugin-gtk.sh" curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/raw/master/linuxdeploy-plugin-gtk.sh"
curl -sSfLO "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$LINUX_DEPLOY_ARCH.AppImage"
chmod a+x linuxdeploy* chmod a+x linuxdeploy*
@ -36,4 +35,10 @@ echo 'else' >> AppDir/AppRun
echo ' cd "$this_dir"/usr/bin/' >> AppDir/AppRun echo ' cd "$this_dir"/usr/bin/' >> AppDir/AppRun
echo ' ./Zelda64Recompiled' >> AppDir/AppRun echo ' ./Zelda64Recompiled' >> AppDir/AppRun
echo 'fi' >> AppDir/AppRun echo 'fi' >> AppDir/AppRun
# Remove conflicting libraries
rm -rf AppDir/usr/lib/libgmodule*
rm -rf AppDir/usr/lib/gio/modules/*.so
rm -rf AppDir/usr/lib/libwayland*
./deploy/usr/bin/linuxdeploy-plugin-appimage --appdir=AppDir ./deploy/usr/bin/linuxdeploy-plugin-appimage --appdir=AppDir

View File

@ -36,10 +36,6 @@ jobs:
uses: hendrikmuhs/ccache-action@v1.2.11 uses: hendrikmuhs/ccache-action@v1.2.11
with: with:
key: ${{ matrix.os }}-z64re-ccache-${{ matrix.type }}-x64-${{ inputs.N64RECOMP_COMMIT }} key: ${{ matrix.os }}-z64re-ccache-${{ matrix.type }}-x64-${{ inputs.N64RECOMP_COMMIT }}
- name: Install Linux Dependencies
run: |
apt-get update
apt-get install -y libcanberra-gtk-module libcanberra-gtk3-module libgbm-dev
- name: Prepare Build - name: Prepare Build
run: |- run: |-
git clone ${{ secrets.ZRE_REPO_WITH_PAT }} git clone ${{ secrets.ZRE_REPO_WITH_PAT }}
@ -87,12 +83,6 @@ jobs:
- name: Build AppImage - name: Build AppImage
run: |- run: |-
./.github/linux/appimage.sh ./.github/linux/appimage.sh
- name: Adjust AppImage
run: |
./Zelda64Recompiled-x86_64.AppImage --appimage-extract
rm -rf squashfs-root/usr/lib/libgmodule*
appimagetool-x86_64.AppImage -v squashfs-root
rm -rf squashfs-root/
- name: Zelda64Recomp AppImage - name: Zelda64Recomp AppImage
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with: