diff --git a/.github/workflows/nightly_win_lin.yml b/.github/workflows/nightly_win_lin.yml index 4670da8..c67c7b8 100644 --- a/.github/workflows/nightly_win_lin.yml +++ b/.github/workflows/nightly_win_lin.yml @@ -24,7 +24,7 @@ jobs: - name: fetch shaders working-directory: shaders run: | - git clone https://github.com/libretro/common-shaders.git && mv common-shaders shaders_cg && rm -rf shaders_cg/.git +# git clone https://github.com/libretro/common-shaders.git && mv common-shaders shaders_cg && rm -rf shaders_cg/.git git clone https://github.com/libretro/glsl-shaders.git && mv glsl-shaders shaders_glsl && rm -rf shaders_glsl/.git git clone https://github.com/libretro/slang-shaders.git && mv slang-shaders shaders_slang && rm -rf shaders_slang/.git - run: | @@ -55,16 +55,16 @@ jobs: mv filters retroarch/ mkdir retroarch/database && mv database retroarch/database/rdb mv cheats retroarch/ - mkdir RetroArch-Linux-x86_64-Nightly.AppImage.config - mv retroarch/ RetroArch-Linux-x86_64-Nightly.AppImage.config - 7z a -mx=9 RetroArch-Linux-x86_64-Nightly.AppImage.config.7z RetroArch-Linux-x86_64-Nightly.AppImage.config + mkdir RetroArch-Linux-x86_64-Nightly.AppImage.home + mv retroarch/ RetroArch-Linux-x86_64-Nightly.AppImage.home + 7z a -mx=9 RetroArch-Linux-x86_64-Nightly.AppImage.home.7z RetroArch-Linux-x86_64-Nightly.AppImage.home - name: Upload Linux AppImage assets bundle uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: RetroArch-Linux-x86_64-Nightly.AppImage.config.7z + file: RetroArch-Linux-x86_64-Nightly.AppImage.home.7z tag: Nightlies - asset_name: RetroArch-Linux-x86_64-Nightly.AppImage.config.7z + asset_name: RetroArch-Linux-x86_64-Nightly.AppImage.home.7z overwrite: true Linux: @@ -94,7 +94,7 @@ jobs: Linux_LTS: name: Build RetroArch LTS Linux AppImage Nightly - runs-on: ubuntu-16.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 @@ -117,119 +117,119 @@ jobs: asset_name: RetroArch-Linux-x86_64-Nightly.AppImage overwrite: true - Windows: - name: Build RetroArch Nightly Windows - needs: Assets - runs-on: windows-latest +# Windows: +# name: Build RetroArch Nightly Windows +# needs: Assets +# runs-on: windows-latest - steps: - - uses: msys2/setup-msys2@v2 - with: - update: true - install: >- - base-devel - git - wget - make - mingw-w64-x86_64-binutils - mingw-w64-x86_64-toolchain - mingw-w64-x86_64-ntldd - mingw-w64-x86_64-zlib - mingw-w64-x86_64-pkg-config - mingw-w64-x86_64-SDL2 - mingw-w64-x86_64-libxml2 - mingw-w64-x86_64-freetype - mingw-w64-x86_64-python3 - mingw-w64-x86_64-ffmpeg - mingw-w64-x86_64-drmingw - mingw-w64-x86_64-qt5 - mingw-w64-x86_64-openssl - mingw-w64-x86_64-nvidia-cg-toolkit - unzip - p7zip - - uses: actions/checkout@v2 - - name: Fetch the source - run: git clone https://github.com/libretro/RetroArch.git - - shell: msys2 {0} - working-directory: RetroArch - run: | - ./configure --enable-qt - make -j8 - - name: Setup working dir - run: mkdir working_dir - - name: Gather Qt libs - working-directory: RetroArch - run: ForEach ($l in $(msys2 -c ntldd.exe -R 'imageformats/*dll' | grep mingw64 | sed -e 's/^[ \t]*//'|cut -d' ' -f3)){cp "$l" ../working_dir} - - name: Gather the other libs - working-directory: RetroArch - run: ForEach ($l in $(msys2 -c ntldd.exe -R '*.exe'|grep mingw64|sed -e 's/^[ \t]*//'|cut -d' ' -f3)){cp "$l" ../working_dir} - - shell: msys2 {0} - working-directory: RetroArch/libretro-common/audio/dsp_filters - run: make - - shell: msys2 {0} - working-directory: RetroArch/gfx/video_filters - run: make -# - name: Free up some disk space +# steps: +# - uses: msys2/setup-msys2@v2 +# with: +# update: true +# install: >- +# base-devel +# git +# wget +# make +# mingw-w64-x86_64-binutils +# mingw-w64-x86_64-toolchain +# mingw-w64-x86_64-ntldd +# mingw-w64-x86_64-zlib +# mingw-w64-x86_64-pkg-config +# mingw-w64-x86_64-SDL2 +# mingw-w64-x86_64-libxml2 +# mingw-w64-x86_64-freetype +# mingw-w64-x86_64-python3 +# mingw-w64-x86_64-ffmpeg +# mingw-w64-x86_64-drmingw +# mingw-w64-x86_64-qt5 +# mingw-w64-x86_64-openssl +# mingw-w64-x86_64-nvidia-cg-toolkit +# unzip +# p7zip +# - uses: actions/checkout@v2 +# - name: Fetch the source +# run: git clone https://github.com/libretro/RetroArch.git +# - shell: msys2 {0} # working-directory: RetroArch -# run: rm -rf .git && pacman -Rsu --noconfirm mingw-w64-x86_64-toolchain mingw-w64-x86_64-openssl - - name: Create debug exe and strip regular exe - working-directory: RetroArch - run: cp retroarch.exe retroarch_debug.exe && strip.exe -s retroarch.exe - - name: Move executables to working dir (libs are already there) - working-directory: RetroArch - run: mv *.exe ../working_dir - - shell: msys2 {0} - working-directory: working_dir - run: windeployqt --debug --no-patchqt --no-translations retroarch.exe - - name: Zip just the executables and libs - working-directory: working_dir - run: 7z a -mx=9 RetroArch-Win-x86_64-Nightly_Update-Pack.7z *.exe *dll - - name: Upload Update Pack - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: working_dir/RetroArch-Win-x86_64-Nightly_Update-Pack.7z - tag: Nightlies - asset_name: RetroArch-Win-x86_64-Nightly_Update-Pack.7z - overwrite: true - - name: Download assets package from previous job - uses: actions/download-artifact@v2 - with: - name: assets.7z - - shell: msys2 {0} - working-directory: working_dir - run: mv ../assets.7z ./ && 7z x assets.7z && rm -rf assets.7z RetroArch-Win-x86_64-Nightly_Update-Pack.7z filters/audio/*.so filters/video/*.so - - name: Copy filters to assets dir - run: mv RetroArch/libretro-common/audio/dsp_filters/*dll working_dir/filters/audio && mv RetroArch/gfx/video_filters/*dll working_dir/filters/video - - name: Zip the full release - working-directory: working_dir - run: 7z a -mx=9 RetroArch-Win-x86_64-Nightly_Full.7z * - - name: Upload RetroArch release bundle - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: working_dir/RetroArch-Win-x86_64-Nightly_Full.7z - tag: Nightlies - asset_name: RetroArch-Win-x86_64-Nightly_Full.7z - overwrite: true - - shell: msys2 {0} - run: rm -rf working_dir && mkdir RetroArch/angle -# - name: Reinstall necessary packages -# run: msys2do pacman -S --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-openssl - - shell: msys2 {0} - working-directory: RetroArch - run: ./configure --enable-angle --enable-dynamic_egl && make - - name: Gather resources - working-directory: RetroArch/angle - run: mv ../retroarch_angle.exe ./ && mv ../pkg/windows/x86_64/libEGL.dll ./ && mv ../pkg/windows/x86_64/libGLESv2.dll ./ - - name: Zip the ANGLE bundle - working-directory: RetroArch/angle - run: 7z a -mx=9 RetroArch-ANGLE-x86_64-Nightly_Add-on.7z * - - name: Upload ANGLE release bundle - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: RetroArch/angle/RetroArch-ANGLE-x86_64-Nightly_Add-on.7z - tag: Nightlies - asset_name: RetroArch-ANGLE-x86_64-Nightly_Add-on.7z - overwrite: true +# run: | +# ./configure --enable-qt +# make -j8 +# - name: Setup working dir +# run: mkdir working_dir +# - name: Gather Qt libs +# working-directory: RetroArch +# run: ForEach ($l in $(msys2 -c ntldd.exe -R 'imageformats/*dll' | grep mingw64 | sed -e 's/^[ \t]*//'|cut -d' ' -f3)){cp "$l" ../working_dir} +# - name: Gather the other libs +# working-directory: RetroArch +# run: ForEach ($l in $(msys2 -c ntldd.exe -R '*.exe'|grep mingw64|sed -e 's/^[ \t]*//'|cut -d' ' -f3)){cp "$l" ../working_dir} +# - shell: msys2 {0} +# working-directory: RetroArch/libretro-common/audio/dsp_filters +# run: make +# - shell: msys2 {0} +# working-directory: RetroArch/gfx/video_filters +# run: make +## - name: Free up some disk space +## working-directory: RetroArch +## run: rm -rf .git && pacman -Rsu --noconfirm mingw-w64-x86_64-toolchain mingw-w64-x86_64-openssl +# - name: Create debug exe and strip regular exe +# working-directory: RetroArch +# run: cp retroarch.exe retroarch_debug.exe && strip.exe -s retroarch.exe +# - name: Move executables to working dir (libs are already there) +# working-directory: RetroArch +# run: mv *.exe ../working_dir +# - shell: msys2 {0} +# working-directory: working_dir +# run: windeployqt --debug --no-patchqt --no-translations retroarch.exe +# - name: Zip just the executables and libs +# working-directory: working_dir +# run: 7z a -mx=9 RetroArch-Win-x86_64-Nightly_Update-Pack.7z *.exe *dll +# - name: Upload Update Pack +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: working_dir/RetroArch-Win-x86_64-Nightly_Update-Pack.7z +# tag: Nightlies +# asset_name: RetroArch-Win-x86_64-Nightly_Update-Pack.7z +# overwrite: true +# - name: Download assets package from previous job +# uses: actions/download-artifact@v2 +# with: +# name: assets.7z +# - shell: msys2 {0} +# working-directory: working_dir +# run: mv ../assets.7z ./ && 7z x assets.7z && rm -rf assets.7z RetroArch-Win-x86_64-Nightly_Update-Pack.7z filters/audio/*.so filters/video/*.so +# - name: Copy filters to assets dir +# run: mv RetroArch/libretro-common/audio/dsp_filters/*dll working_dir/filters/audio && mv RetroArch/gfx/video_filters/*dll working_dir/filters/video +# - name: Zip the full release +# working-directory: working_dir +# run: 7z a -mx=9 RetroArch-Win-x86_64-Nightly_Full.7z * +# - name: Upload RetroArch release bundle +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: working_dir/RetroArch-Win-x86_64-Nightly_Full.7z +# tag: Nightlies +# asset_name: RetroArch-Win-x86_64-Nightly_Full.7z +# overwrite: true +# - shell: msys2 {0} +# run: rm -rf working_dir && mkdir RetroArch/angle +## - name: Reinstall necessary packages +## run: msys2do pacman -S --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-openssl +# - shell: msys2 {0} +# working-directory: RetroArch +# run: ./configure --enable-angle --enable-dynamic_egl && make +# - name: Gather resources +# working-directory: RetroArch/angle +# run: mv ../retroarch_angle.exe ./ && mv ../pkg/windows/x86_64/libEGL.dll ./ && mv ../pkg/windows/x86_64/libGLESv2.dll ./ +# - name: Zip the ANGLE bundle +# working-directory: RetroArch/angle +# run: 7z a -mx=9 RetroArch-ANGLE-x86_64-Nightly_Add-on.7z * +# - name: Upload ANGLE release bundle +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: RetroArch/angle/RetroArch-ANGLE-x86_64-Nightly_Add-on.7z +# tag: Nightlies +# asset_name: RetroArch-ANGLE-x86_64-Nightly_Add-on.7z +# overwrite: true