actions: Linux & Source builds (#26)

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/26 Co-authored-by: swurl <swurl@swurl.xyz> Co-committed-by: swurl <swurl@swurl.xyz> android build, fix appimage Signed-off-by: swurl <swurl@swurl.xyz>
8 months ago · 52d851500c
8 changed files with 65 additions and 88 deletions
--- a/.ci/android.sh
+++ b/.ci/android.sh
@ -2,18 +2,16 @@

 export NDK_CCACHE=$(which ccache)

-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-fi
+# keystore & pass are stored locally
+export ANDROID_KEYSTORE_FILE=~/android.keystore
+export ANDROID_KEYSTORE_PASS=`cat ~/android.pass`
+export ANDROID_KEY_ALIAS=`cat ~/android.alias`
+export ANDROID_HOME=/opt/android-sdk/

 cd src/android
 chmod +x ./gradlew
+
 ./gradlew assembleRelease
 ./gradlew bundleRelease

 ccache -s -v
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    rm "${ANDROID_KEYSTORE_FILE}"
-fi
--- a/.ci/linux.sh
+++ b/.ci/linux.sh
@ -22,8 +22,9 @@ cmake .. -G Ninja \
    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
    -DENABLE_QT_TRANSLATION=ON \
    -DUSE_DISCORD_PRESENCE=ON \
-    -DYUZU_USE_BUNDLED_VCPKG=ON \
+    -DUSE_CCACHE=ON \
 	"${EXTRA_CMAKE_FLAGS[@]}"
+
 ninja -j4
 if [ -d "bin/Release" ]; then
  strip -s bin/Release/*
@ -37,4 +38,4 @@ else
    ccache -s -v
 fi

-ctest -VV -C Release
+#ctest -VV -C Release
--- a/.ci/source.sh
+++ b/.ci/source.sh
@ -1,5 +1,8 @@
 #!/bin/bash -ex

+# git-archive-all
+export PATH="$PATH:/home/$USER/.local/bin"
+
 GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
 GITREV="`git show -s --format='%h'`"
 REV_NAME="eden-unified-source-${GITDATE}-${GITREV}"
@ -8,11 +11,10 @@ COMPAT_LIST='dist/compatibility_list/compatibility_list.json'

 mkdir artifacts

-pip3 install git-archive-all
 touch "${COMPAT_LIST}"
 git describe --abbrev=0 --always HEAD > GIT-COMMIT
 git describe --tags HEAD > GIT-TAG || echo 'unknown' > GIT-TAG
-git archive-all --include "${COMPAT_LIST}" --include GIT-COMMIT --include GIT-TAG --force-submodules artifacts/"${REV_NAME}.tar"
+git-archive-all --include "${COMPAT_LIST}" --include GIT-COMMIT --include GIT-TAG --force-submodules artifacts/"${REV_NAME}.tar"

 cd artifacts/
 xz -T0 -9 "${REV_NAME}.tar"
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,3 +1,6 @@
+# TODO: This document needs to be formatted,
+# appimage should use linuxdeploy probably
+# some stuff needs cleaned up etc
 name: eden-build

 on:
@ -20,7 +23,7 @@ jobs:
      - name: Upload
        uses: forgejo/upload-artifact@v4
        with:
-          name: source
+          name: source.zip
          path: artifacts/
  windows:
    runs-on: windows-latest
@ -31,7 +34,7 @@ jobs:
      run:
        shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0}
    env:
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_DIR: ${{ runner.workspace }}/.cache/.ccache
      CCACHE_COMPILERCHECK: content
      CCACHE_SLOPPINESS: time_macros
      OS: windows
@ -40,14 +43,9 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
-          fetch-depth: 0
-      - name: Set up ccache
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-${{ matrix.target }}-ccache-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.target }}-ccache-
+          fetch-depth: 1
+          fetch-tags: true
+
      - name: Set up vcpkg cache
        uses: actions/cache@v4
        with:
@ -58,6 +56,7 @@ jobs:
          key: ${{ runner.os }}-${{ matrix.target }}-vcpkg-${{ hashFiles('**/CMakeLists.txt', '**/vcpkg.json') }}-${{ github.run_id }}
          restore-keys: |
            ${{ runner.os }}-${{ matrix.target }}-vcpkg-
+
      - name: Set up MSVC
        uses: ilammy/msvc-dev-cmd@v1
        if: ${{ matrix.target == 'msvc' }}
@ -143,12 +142,12 @@ jobs:
        if: steps.build.outcome == 'success'
        uses: forgejo/upload-artifact@v4
        with:
-          name: ${{ matrix.target }}
+          name: ${{ matrix.target }}.zip
          path: artifacts/*
  linux:
    runs-on: linux
    env:
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_DIR: /home/runner/.cache/ccache
      CCACHE_COMPILERCHECK: content
      CCACHE_SLOPPINESS: time_macros
      OS: linux
@ -157,25 +156,8 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
-          fetch-depth: 0
-      - name: Set up cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-fresh-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-fresh-
-
-      - name: Set up vcpkg cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ github.workspace }}/build/vcpkg_installed
-            ${{ github.workspace }}/build/externals
-            ${{ github.workspace }}/.vcpkg
-          key: ${{ runner.os }}-fresh-vcpkg-${{ hashFiles('**/CMakeLists.txt', '**/vcpkg.json') }}-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-fresh-vcpkg-
+          fetch-depth: 1
+          fetch-tags: true

      - name: Build
        run: ./.ci/linux.sh
@ -187,47 +169,41 @@ jobs:
      - name: Upload Linux artifacts
        uses: forgejo/upload-artifact@v4
        with:
-          name: linux
+          name: linux.zip
          path: artifacts/*
+
  android:
    runs-on: android
+
    env:
-      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_DIR: /home/runner/.cache/ccache
      CCACHE_COMPILERCHECK: content
      CCACHE_SLOPPINESS: time_macros
      OS: android
      TARGET: universal
+
    steps:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
-          fetch-depth: 0
-      - name: Set up cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-android-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-android-
+          fetch-depth: 1
+          fetch-tags: true
+
      - name: Set tag name
        run: |
          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
              echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
          fi
          echo $GIT_TAG_NAME
+
      - name: Deps
        run: |
          sudo apt-get update -y
          sudo apt-get install ccache glslang-dev glslang-tools apksigner -y
+
      - name: Build
        run: JAVA_HOME=$JAVA_HOME_21_X64 ./.ci/android.sh
-        env:
-          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
-          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
-          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+
      - name: Package Android artifacts
        run: |
          GITDATE="$(git show -s --date=short --format='%ad' | sed 's/-//g')"
@ -251,5 +227,5 @@ jobs:
      - name: Upload Android artifacts
        uses: forgejo/upload-artifact@v4
        with:
-          name: android
+          name: android.zip
          path: artifacts/*
--- a/.github/workflows/license-header.yml
+++ b/.github/workflows/license-header.yml
@ -6,7 +6,7 @@ on:

 jobs:
  license-header:
-    runs-on: ubuntu-latest
+    runs-on: linux
    container:
      image: opensauce04/lime3ds-build:latest
      options: -u 1001
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -299,7 +299,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)

 # Enforce the search mode of non-required packages for better and shorter failure messages
 find_package(enet 1.3 MODULE)
-find_package(fmt 11 REQUIRED)
+find_package(fmt 10 REQUIRED)
 find_package(LLVM 17.0.2 MODULE COMPONENTS Demangle)
 find_package(lz4 REQUIRED)
 find_package(nlohmann_json 3.8 REQUIRED)
--- a/dist/org.yuzu_emu.yuzu.desktop
+++ b/dist/org.yuzu_emu.yuzu.desktop
@ -4,13 +4,13 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=yuzu
+Name=eden
 GenericName=Switch Emulator
 Comment=Nintendo Switch video game console emulator
-Icon=org.yuzu_emu.yuzu
+Icon=org.yuzu_emu.eden
 TryExec=eden
 Exec=eden %f
 Categories=Game;Emulator;Qt;
 MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
 Keywords=Nintendo;Switch;
-StartupWMClass=yuzu
+StartupWMClass=eden