simplify CI and dolphin build process (#33)

* test

* test

* Update dolphin-emu-appimage.sh

* Update get-dependencies.sh

* Update get-dependencies.sh

* Update dolphin-emu-appimage.sh

* Update get-dependencies.sh

* Update get-dependencies.sh

* Update get-dependencies.sh

* Update dolphin-emu-appimage.sh

* Update stable.yml

* Update nightly.yml

Author: Samueru-sama

.github/workflows/nightly.yml

@@ -16,87 +16,58 @@ jobs:
       matrix:
         include:
           - runs-on: ubuntu-latest
-            name: "Dolphin build"
+            name: Build AppImage
             arch: x86_64
           - runs-on: ubuntu-24.04-arm
-            name: "Dolphin build"
+            name: Build AppImage
             arch: aarch64
     container: ghcr.io/pkgforge-dev/archlinux:latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
 
       - name: Get dependencies
-        run: chmod +x ./get-dependencies.sh && ./get-dependencies.sh
+        run: chmod +x ./get-dependencies.sh && DEVEL=true ./get-dependencies.sh
 
       - name: Make AppImage
-        run: |
-          export DEVEL=true
-          chmod +x ./dolphin-emu-appimage.sh  && ./dolphin-emu-appimage.sh
-          mkdir dist
-          mv *.AppImage* dist/
-
-      - name: Check version file
-        run: |
-         cat ~/version
-         echo "APP_VERSION=$(cat ~/version)" >> "${GITHUB_ENV}"
+        run: chmod +x ./*-appimage.sh && ./*-appimage.sh
 
       - name: Upload artifact
         uses: actions/[email protected]
         with:
           name: AppImage-${{ matrix.arch }}
-          path: 'dist'
-          
-      - name: Upload version file
-        uses: actions/[email protected]
-        with:
-         name: version
-         path: ~/version
-         overwrite: true
+          path: dist
 
   release:
       if: ${{ github.ref_name == 'main' }}
       needs: [build]
       permissions: write-all
       runs-on: ubuntu-latest
-
       steps:
-        - uses: actions/[email protected]
-          with:
-            name: AppImage-x86_64
-
-        - uses: actions/[email protected]
-          with:
-            name: AppImage-aarch64
+      - uses: actions/[email protected]
+        with:
+          pattern: AppImage-*
+          merge-multiple: true
 
-        - uses: actions/[email protected]
-          with:
-            name: version
+      - name: Read version and Get date
+        run: |
+          cat ./version
+          echo "VERSION=$(cat ./version)" >> "${GITHUB_ENV}"
+          echo "DATE=$(date +'%Y-%m-%d_%s')" >> "${GITHUB_ENV}"
 
-        - name: Read version
-          run: |
-            cat version
-            export VERSION="$(cat version)"
-            export SNAPSHOT_TAG="$(date --utc +'%Y-%m-%d')"
-            echo "APP_VERSION=${VERSION}" >> "${GITHUB_ENV}"
-            echo SNAPSHOT_TAG="${SNAPSHOT_TAG}" >> "${GITHUB_ENV}"
-    
-        #Version Release
-        - name: Del Previous Release
-          run: gh release delete "nightly" --repo "${GITHUB_REPOSITORY}" --cleanup-tag -y && sleep 5
-          env:
-            GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          continue-on-error: true
+      - name: Del Previous Release
+        run: gh release delete "nightly" --repo "${GITHUB_REPOSITORY}" --cleanup-tag -y && sleep 5
+        env:
+          GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        continue-on-error: true
 
-        - name: Release nightly build
-          uses: softprops/[email protected]
-          with:
-            name: "Nightly Build (${{ env.SNAPSHOT_TAG }})"
-            tag_name: "nightly"
-            prerelease: true
-            draft: false
-            generate_release_notes: false
-            make_latest: false
-            files: |
-              *.AppImage*
+      - name: Release nightly build
+        uses: softprops/[email protected]
+        with:
+          name: "Nightly Build (${{ env.DATE }})"
+          tag_name: "nightly"
+          prerelease: true
+          draft: false
+          generate_release_notes: false
+          make_latest: false
+          files: |
+            *.AppImage*

.github/workflows/stable.yml

@@ -16,86 +16,62 @@ jobs:
       matrix:
         include:
           - runs-on: ubuntu-latest
-            name: "Dolphin build"
+            name: Build AppImage
             arch: x86_64
           - runs-on: ubuntu-24.04-arm
-            name: "Dolphin build"
+            name: Build AppImage
             arch: aarch64
     container: ghcr.io/pkgforge-dev/archlinux:latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
 
       - name: Get dependencies
         run: chmod +x ./get-dependencies.sh && ./get-dependencies.sh
 
       - name: Make AppImage
-        run: |
-          chmod +x ./dolphin-emu-appimage.sh  && ./dolphin-emu-appimage.sh
-          mkdir dist
-          mv *.AppImage* dist/
+        run: chmod +x ./*-appimage.sh && ./*-appimage.sh
 
-      - name: Check version file
-        run: |
-         cat ~/version
-         echo "APP_VERSION=$(cat ~/version)" >> "${GITHUB_ENV}"
-      
       - name: Upload artifact
         uses: actions/[email protected]
         with:
           name: AppImage-${{ matrix.arch }}
-          path: 'dist'
-          
-      - name: Upload version file
-        uses: actions/[email protected]
-        with:
-         name: version
-         path: ~/version
-         overwrite: true
+          path: dist
 
   release:
-      if: ${{ github.ref_name == 'main' }}
-      needs: [build]
-      permissions: write-all
-      runs-on: ubuntu-latest
-
-      steps:
-        - uses: actions/[email protected]
-          with:
-            name: AppImage-x86_64
-
-        - uses: actions/[email protected]
-          with:
-            name: AppImage-aarch64
-
-        - uses: actions/[email protected]
-          with:
-            name: version
+    if: ${{ github.ref_name == 'main' }}
+    needs: [build]
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          pattern: AppImage-*
+          merge-multiple: true
 
-        - name: Read version and Get date
-          run: |
-            echo "VERSION=$(cat version)" >> "${GITHUB_ENV}"
-            echo "DATE=$(date +'%Y-%m-%d_%s')" >> "${GITHUB_ENV}"
+      - name: Read version and Get date
+        run: |
+          cat ./version
+          echo "VERSION=$(cat ./version)" >> "${GITHUB_ENV}"
+          echo "DATE=$(date +'%Y-%m-%d_%s')" >> "${GITHUB_ENV}"
 
-        - name: Release Artifacts
-          uses: softprops/[email protected]
-          with:
-            name: "Dolphin Emulator: ${{ env.VERSION }}"
-            tag_name: "${{ env.VERSION }}@${{ env.DATE }}"
-            prerelease: false
-            draft: false
-            generate_release_notes: false
-            make_latest: true
-            files: |
-              *.AppImage*
+      - name: Release Artifacts
+        uses: softprops/[email protected]
+        with:
+          name: "Dolphin Emulator: ${{ env.VERSION }}"
+          tag_name: "${{ env.VERSION }}@${{ env.DATE }}"
+          prerelease: false
+          draft: false
+          generate_release_notes: false
+          make_latest: true
+          files: |
+            *.AppImage*
 
-        - uses: actions/checkout@v4
-        - name: Update LATEST_VERSION
-          run: |
-            echo "${{ env.VERSION }}" > ./LATEST_VERSION
-            git config user.name "github-actions[bot]"
-            git config user.email "github-actions[bot]@users.noreply.github.com"
-            git add ./LATEST_VERSION
-            git commit --allow-empty -m 'bump `LATEST_VERSION` [skip ci]'
-            git push
+      - uses: actions/checkout@v4
+      - name: Update LATEST_VERSION
+        run: |
+          echo "${{ env.VERSION }}" > ./LATEST_VERSION
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add ./LATEST_VERSION
+          git commit --allow-empty -m 'bump `LATEST_VERSION` [skip ci]'
+          git push

dolphin-emu-appimage.sh

@@ -2,67 +2,28 @@
 
 set -ex
 
-REPO="https://github.com/dolphin-emu/dolphin.git"
-GRON="https://raw.githubusercontent.com/xonixx/gron.awk/refs/heads/main/gron.awk"
 export APPIMAGE_EXTRACT_AND_RUN=1
 export ARCH="$(uname -m)"
 
-# Determine to build nightly or stable
-if [ "$DEVEL" = 'true' ]; then
-	echo "Making nightly build of dolphin-emu..."
-	VERSION="$(git ls-remote "$REPO" HEAD | cut -c 1-9 | head -1)"
-	UPINFO="$(echo "$UPINFO" | sed 's|latest|nightly|')"
-	git clone "$REPO" ./dolphin
-else
-	echo "Making stable build of dolphin-emu..."
-	wget "$GRON" -O ./gron.awk
-	chmod +x ./gron.awk
-	VERSION=$(wget https://api.github.com/repos/dolphin-emu/dolphin/tags -O - | \
-		./gron.awk | grep -v "nJoy" | awk -F'=|"' '/name/ {print $3}' | \
-		sort -V -r | head -1)
-	git clone --branch "$VERSION" --single-branch "$REPO" ./dolphin
-fi
-
-# BUILD DOLPHIN
-(
-	cd ./dolphin 
-	mkdir ./build 
-	cd ./build
-
-	git submodule update --init --recursive
-	cmake .. -DLINUX_LOCAL_DEV=true -DCMAKE_POLICY_VERSION_MINIMUM=3.5
-	make -j $(nproc)
-	sudo make install
-
-	sudo cp -r ../Data/Sys /usr/local/bin
-	sudo cp -r ./Source/Core/DolphinQt /usr/local/bin
-  )
-
 # Deploy AppImage
-[ -n "$VERSION" ] && echo "$VERSION" > ~/version
+VERSION="$(cat ~/version)"
 APPIMAGETOOL="https://github.com/pkgforge-dev/appimagetool-uruntime/releases/download/continuous/appimagetool-$ARCH.AppImage"
 URUNTIME="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/uruntime2appimage.sh"
 SHARUN="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh"
 
 export ADD_HOOKS="self-updater.bg.hook"
 export UPINFO="gh-releases-zsync|${GITHUB_REPOSITORY%/*}|${GITHUB_REPOSITORY#*/}|latest|*dwarfs-$ARCH.AppImage.zsync"
 export OUTNAME=Dolphin_Emulator-"$VERSION"-anylinux.dwarfs-"$ARCH".AppImage
+export PATH_MAPPING_RELATIVE=1 # Dolphin is hardcoded to /urs/share
+export DEPLOY_LOCALE=1
 export DEPLOY_OPENGL=1 
 export DEPLOY_VULKAN=1 
 export DEPLOY_PIPEWIRE=1
 
 # Bundle all libs
 wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun
 chmod +x ./quick-sharun
-./quick-sharun /usr/local/bin/dolphin-*
-
-# copy locales, the dolphin binary expects them here
-mkdir -p ./AppDir/Source/Core
-cp -r /usr/local/bin/DolphinQt ./AppDir/Source/Core
-find ./AppDir/Source/Core/DolphinQt -type f ! -name 'dolphin-emu.mo' -delete
-
-# when compiled portable this directory needs a capital S
-cp -rv /usr/local/bin/Sys ./AppDir/bin/Sys
+./quick-sharun /usr/bin/dolphin-*
 
 # Force C locale due to issues with gconv causing crashes
 # See https://github.com/pkgforge-dev/Dolphin-emu-AppImage/issues/28
@@ -91,4 +52,7 @@ wget --retry-connrefused --tries=30 "$APPIMAGETOOL" -O ./appimagetool
 chmod +x ./appimagetool
 ./appimagetool -n -u "$UPINFO" "$PWD"/AppDir "$PWD"/Dolphin_Emulator-"$VERSION"-anylinux.squashfs-"$ARCH".AppImage
 
+mkdir -p ./dist
+mv -v ./*.AppImage*  ./dist
+mv -v ~/version      ./dist
 echo "All Done!"

get-dependencies.sh

@@ -21,17 +21,13 @@ pacman -Syu --noconfirm \
 	lz4              \
 	lzo              \
 	mesa             \
-	patchelf         \
 	pipewire-audio   \
 	pulseaudio       \
 	pulseaudio-alsa  \
 	qt6ct            \
 	sdl2             \
 	speexdsp         \
-	strace           \
 	vulkan-headers   \
-	vulkan-nouveau   \
-	vulkan-radeon    \
 	wget             \
 	xcb-util-cursor  \
 	xorg-server-xvfb \
@@ -44,4 +40,44 @@ echo "Installing debloated packages..."
 echo "---------------------------------------------------------------"
 wget --retry-connrefused --tries=30 "$EXTRA_PACKAGES" -O ./get-debloated-pkgs.sh
 chmod +x ./get-debloated-pkgs.sh
-./get-debloated-pkgs.sh --add-common
+sed -i 's|set -e|set -ex|' ./get-debloated-pkgs.sh
+./get-debloated-pkgs.sh --add-mesa llvm-libs-nano libxml2-mini qt6-base-mini gtk3-mini opus-mini
+
+echo "Building dolphin..."
+echo "---------------------------------------------------------------"
+REPO="https://github.com/dolphin-emu/dolphin.git"
+GRON="https://raw.githubusercontent.com/xonixx/gron.awk/refs/heads/main/gron.awk"
+
+# Determine to build nightly or stable
+if [ "$DEVEL" = 'true' ]; then
+	echo "Making nightly build of dolphin-emu..."
+	VERSION="$(git ls-remote "$REPO" HEAD | cut -c 1-9 | head -1)"
+	UPINFO="$(echo "$UPINFO" | sed 's|latest|nightly|')"
+	git clone "$REPO" ./dolphin
+else
+	echo "Making stable build of dolphin-emu..."
+	wget "$GRON" -O ./gron.awk
+	chmod +x ./gron.awk
+	VERSION=$(wget https://api.github.com/repos/dolphin-emu/dolphin/tags -O - | \
+		./gron.awk | grep -v "nJoy" | awk -F'=|"' '/name/ {print $3}' | \
+		sort -V -r | head -1)
+	git clone --branch "$VERSION" --single-branch "$REPO" ./dolphin
+fi
+echo "$VERSION" > ~/version
+
+# BUILD DOLPHIN
+cd ./dolphin 
+mkdir ./build 
+cd ./build
+git submodule update --init --recursive
+cmake .. \
+	-DDISTRIBUTOR=pkgforge-dev   \
+	-DCMAKE_INSTALL_PREFIX=/usr  \
+    -DENABLE_ANALYTICS=OFF       \
+	-DENABLE_LLVM=OFF            \
+	-DUSE_DISCORD_PRESENCE=OFF   \
+    -DENABLE_AUTOUPDATE=OFF      \
+	-DENCODE_FRAMEDUMPS=OFF      \
+	-DCMAKE_POLICY_VERSION_MINIMUM=3.5
+make -j $(nproc)
+sudo make install