From 5e0e6c71bfa04a1ecf1df989c075f14d6652a825 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Wed, 19 May 2021 13:27:20 +1000 Subject: [PATCH] CI: Improve naming of libretro binaries --- .github/workflows/rolling-release.yml | 131 +------------------------- 1 file changed, 1 insertion(+), 130 deletions(-) diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index 832daca7d..f72d56a10 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -87,31 +87,6 @@ jobs: name: "windows" path: "duckstation-windows-x64-release.zip" - - name: Compile libretro core - if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' - shell: cmd - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 - bash src\duckstation-libretro\unseal.sh ${{ secrets.LIBRETRO_KEY }} - mkdir build - cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON -DCMAKE_C_COMPILER:FILEPATH="%VCToolsInstallDir%\bin\HostX64\x64\cl.exe" -DCMAKE_CXX_COMPILER:FILEPATH="%VCToolsInstallDir%\bin\HostX64\x64\cl.exe" .. - ninja - - - name: Create libretro core archive - if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' - shell: cmd - run: | - cd build - "C:\Program Files\7-Zip\7z.exe" a -r duckstation_libretro.dll.zip ./duckstation_libretro.dll - - - name: Upload release artifact - if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' - uses: actions/upload-artifact@v1 - with: - name: "windows" - path: "build/duckstation_libretro.dll.zip" - windows-arm64-build: runs-on: windows-2019 @@ -230,93 +205,6 @@ jobs: path: "build/duckstation-qt-x64.AppImage.zsync" - linux-libretro-build: - runs-on: ubuntu-20.04 - if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') && github.ref != 'refs/heads/play-store' - steps: - - uses: actions/checkout@v2.3.1 - with: - fetch-depth: 0 - - - name: Install packages - shell: bash - run: | - sudo apt-get update - sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf - - name: Compile and zip Linux x64 libretro core - shell: bash - run: | - ./src/duckstation-libretro/unseal.sh ${{ secrets.LIBRETRO_KEY }} - mkdir build-libretro-linux-x64 - cd build-libretro-linux-x64 - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON .. - cmake --build . --parallel 2 - zip -j duckstation_libretro_x64.so.zip duckstation_libretro.so - - name: Upload Linux x64 libretro core - uses: actions/upload-artifact@v1 - with: - name: "linux-libretro" - path: "build-libretro-linux-x64/duckstation_libretro_x64.so.zip" - - - name: Compile and zip Linux armv7 libretro core - shell: bash - run: | - mkdir build-libretro-linux-armv7 - cd build-libretro-linux-armv7 - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON -DCMAKE_TOOLCHAIN_FILE=../CMakeModules/armv7-cross-toolchain.cmake .. - cmake --build . --parallel 2 - zip -j duckstation_libretro_linux_armv7.so.zip duckstation_libretro.so - - name: Upload Linux AArch64 libretro core - uses: actions/upload-artifact@v1 - with: - name: "linux-libretro" - path: "build-libretro-linux-armv7/duckstation_libretro_linux_armv7.so.zip" - - - name: Compile and zip Linux AArch64 libretro core - shell: bash - run: | - mkdir build-libretro-linux-aarch64 - cd build-libretro-linux-aarch64 - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON -DCMAKE_TOOLCHAIN_FILE=../CMakeModules/aarch64-cross-toolchain.cmake .. - cmake --build . --parallel 2 - zip -j duckstation_libretro_linux_aarch64.so.zip duckstation_libretro.so - - name: Upload Linux AArch64 libretro core - uses: actions/upload-artifact@v1 - with: - name: "linux-libretro" - path: "build-libretro-linux-aarch64/duckstation_libretro_linux_aarch64.so.zip" - - - name: Compile and zip Android armv7 libretro core - shell: bash - run: | - mkdir build-libretro-android-armv7 - cd build-libretro-android-armv7 - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON -DANDROID_ABI=armeabi-v7a -DANDROID_ARM_NEON=ON -DCMAKE_TOOLCHAIN_FILE=${ANDROID_SDK_ROOT}/ndk-bundle/build/cmake/android.toolchain.cmake .. - cmake --build . --parallel 2 - zip -j duckstation_libretro_android_armv7.so.zip duckstation_libretro_android.so - - - name: Upload Android armv7 libretro core - uses: actions/upload-artifact@v1 - with: - name: "linux-libretro" - path: "build-libretro-android-armv7/duckstation_libretro_android_armv7.so.zip" - - - name: Compile and zip Android AArch64 libretro core - shell: bash - run: | - mkdir build-libretro-android-aarch64 - cd build-libretro-android-aarch64 - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBRETRO_CORE=ON -DANDROID_ABI=arm64-v8a -DCMAKE_TOOLCHAIN_FILE=${ANDROID_SDK_ROOT}/ndk-bundle/build/cmake/android.toolchain.cmake .. - cmake --build . --parallel 2 - zip -j duckstation_libretro_android_aarch64.so.zip duckstation_libretro_android.so - - - name: Upload Android AArch64 libretro core - uses: actions/upload-artifact@v1 - with: - name: "linux-libretro" - path: "build-libretro-android-aarch64/duckstation_libretro_android_aarch64.so.zip" - - android-build: runs-on: ubuntu-20.04 steps: @@ -392,7 +280,7 @@ jobs: create-release: - needs: [windows-build, windows-arm64-build, linux-build, linux-libretro-build, android-build] + needs: [windows-build, windows-arm64-build, linux-build, android-build] runs-on: "ubuntu-20.04" if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') && github.ref != 'refs/heads/play-store' steps: @@ -426,11 +314,6 @@ jobs: with: name: "linux-x64-appimage-qt-zsync" - - name: Download Linux libretro core - uses: actions/download-artifact@v1 - with: - name: "linux-libretro" - - name: Download Android APK uses: actions/download-artifact@v1 with: @@ -447,18 +330,12 @@ jobs: files: | windows/duckstation-windows-x64-release.zip windows/duckstation-windows-x64-release-symbols.zip - windows/duckstation_libretro.dll.zip windows-arm64/duckstation-windows-arm64-release.zip windows-arm64/duckstation-windows-arm64-release-symbols.zip linux-x64-appimage-nogui/duckstation-nogui-x64.AppImage linux-x64-appimage-nogui-zsync/duckstation-nogui-x64.AppImage.zsync linux-x64-appimage-qt/duckstation-qt-x64.AppImage linux-x64-appimage-qt-zsync/duckstation-qt-x64.AppImage.zsync - linux-libretro/duckstation_libretro_x64.so.zip - linux-libretro/duckstation_libretro_linux_armv7.so.zip - linux-libretro/duckstation_libretro_linux_aarch64.so.zip - linux-libretro/duckstation_libretro_android_armv7.so.zip - linux-libretro/duckstation_libretro_android_aarch64.so.zip android/duckstation-android.apk - name: Create dev release @@ -472,18 +349,12 @@ jobs: files: | windows/duckstation-windows-x64-release.zip windows/duckstation-windows-x64-release-symbols.zip - windows/duckstation_libretro.dll.zip windows-arm64/duckstation-windows-arm64-release.zip windows-arm64/duckstation-windows-arm64-release-symbols.zip linux-x64-appimage-nogui/duckstation-nogui-x64.AppImage linux-x64-appimage-nogui-zsync/duckstation-nogui-x64.AppImage.zsync linux-x64-appimage-qt/duckstation-qt-x64.AppImage linux-x64-appimage-qt-zsync/duckstation-qt-x64.AppImage.zsync - linux-libretro/duckstation_libretro_x64.so.zip - linux-libretro/duckstation_libretro_linux_armv7.so.zip - linux-libretro/duckstation_libretro_linux_aarch64.so.zip - linux-libretro/duckstation_libretro_android_armv7.so.zip - linux-libretro/duckstation_libretro_android_aarch64.so.zip android/duckstation-android.apk