Fix #71

JesseTG · Nov 1, 2023 · 6f95ce0 · 6f95ce0
1 parent ff0c69e
commit 6f95ce0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 76 deletions.
diff --git a/.github/actions/deps/action.yml b/.github/actions/deps/action.yml
@@ -38,6 +38,11 @@ runs:
       shell: bash
       run: brew install pkg-config cmake ninja ccache
 
+    - name: Add RetroArch PPA
+      if: inputs.test-suite == 'true'
+      shell: bash
+      run: sudo add-apt-repository --yes ppa:libretro/stable
+
       # Skip this step on act due to https://github.com/nektos/act/issues/1849
     - name: Install Dependencies (Linux x86_64/Android)
       if: ${{ !env.ACT && runner.os == 'Linux' && !contains(inputs.target, 'aarch64') }}
@@ -49,7 +54,7 @@ runs:
     - name: Install Dependencies (Linux x86_64/Android + act)
       if: ${{ env.ACT && runner.os == 'Linux' && !contains(inputs.target, 'aarch64') }}
       shell: bash
-      run: sudo apt-get update -qy && sudo apt-get install -qy libepoxy-dev ccache ninja-build cmake p7zip-full xvfb libx11-xcb-dev xdg-utils x11-xserver-utils
+      run: sudo apt-get update -qy && sudo apt-get install -qy libepoxy-dev ccache ninja-build cmake p7zip-full xvfb libx11-xcb-dev xdg-utils x11-xserver-utils retroarch
 
     - name: Install Cross-Compile Support (Linux aarch64)
       if: ${{ runner.os == 'Linux' && contains(inputs.target, 'aarch64') }}
@@ -85,80 +90,6 @@ runs:
       shell: bash
       run: 7z x "${{ inputs.dsi-nand-archive }}"
 
-    - name: Check Out RetroArch
-      if: inputs.test-suite == 'true'
-      uses: actions/checkout@v3
-      with:
-        repository: libretro/RetroArch
-        path: "${{ github.workspace }}/RetroArch"
-        ref: "5b2ed5c9ee45c0ecb740f4835db30189e84058a5"
-        token: "${{ inputs.testfile-repo-token }}"
-
-    - name: Configure RetroArch
-      if: inputs.test-suite == 'true'
-      env:
-        CC: "ccache gcc"
-        CXX: "ccache g++"
-      working-directory: "${{ github.workspace }}/RetroArch"
-      shell: bash
-      run: |
-        ./configure \
-          --disable-accessibility \
-          --disable-alsa \
-          --disable-builtinbearssl \
-          --disable-builtinmbedtls \
-          --disable-cdrom \
-          --disable-cg \
-          --disable-chd \
-          --disable-core_info_cache \
-          --disable-crtswitchres \
-          --disable-discord \
-          --disable-egl \
-          --disable-ffmpeg \
-          --disable-flac \
-          --disable-freetype \
-          --disable-gfx_widgets \
-          --disable-ibxm \
-          --disable-imageviewer \
-          --disable-jack \
-          --disable-libretrodb \
-          --disable-materialui \
-          --disable-netplaydiscovery \
-          --disable-networkgamepad \
-          --disable-online_updater \
-          --disable-oss \
-          --disable-overlay \
-          --disable-ozone \
-          --disable-parport \
-          --disable-patch \
-          --disable-pulse \
-          --disable-qt \
-          --disable-runahead \
-          --disable-sixel \
-          --disable-ssa \
-          --disable-ssl \
-          --disable-stb_image \
-          --disable-stb_vorbis \
-          --disable-systemd \
-          --disable-systemmbedtls \
-          --disable-translate \
-          --disable-update_assets \
-          --disable-update_core_info \
-          --disable-update_cores \
-          --disable-vg \
-          --disable-video_filter \
-          --disable-videocore \
-          --disable-videoprocessor \
-          --disable-xmb \
-          --enable-command \
-          --enable-sse
-
-    - name: Build RetroArch
-      if: inputs.test-suite == 'true'
-      shell: bash
-      working-directory: "${{ github.workspace }}/RetroArch"
-      run: make -j$(nproc)
-
     - name: Install Go
       if: inputs.test-suite == 'true'
       uses: actions/setup-go@v4

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -136,7 +136,7 @@ jobs:
             -DMELONDS_REPOSITORY_URL="${{ vars.MELONDS_REPOSITORY_URL }}" \
             -DMELONDS_REPOSITORY_TAG="${{ vars.MELONDS_REPOSITORY_TAG }}" \
             -DBUILD_TESTING=ON \
-            -DRETROARCH="${{ github.workspace }}/RetroArch/retroarch" \
+            -DRETROARCH="$(which retroarch)" \
             -DARM7_BIOS="${{ env.TESTFILE_DIR }}/${{ secrets.ARM7_BIOS }}" \
             -DARM9_BIOS="${{ env.TESTFILE_DIR }}/${{ secrets.ARM9_BIOS }}" \
             -DARM7_DSI_BIOS="${{ env.TESTFILE_DIR }}/${{ secrets.ARM7_DSI_BIOS }}" \