From 13ead8f8844fbdb87101a16e012266fc061db2b8 Mon Sep 17 00:00:00 2001 From: siedenburg2 Date: Thu, 16 May 2024 18:42:13 +0200 Subject: [PATCH] Update main.yml --- .github/workflows/main.yml | 144 ++----------------------------------- 1 file changed, 4 insertions(+), 140 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fea3cf9c..ecd2a24b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,74 +3,16 @@ name: build on: push: branches: - - release - - prerelease - - test + - master jobs: - build-mac: - runs-on: macos-12 - steps: - - uses: actions/checkout@v4 - - name: Install dependencies - run: | - brew update - brew install ninja mpv qt@5 || true - - name: Release build - run: | - ./download_webclient.sh - sed -i '' 's|await loadScript('\''qrc:///qtwebchannel/qwebchannel.js'\'');|document.body.style.overscrollBehavior = "none";&|g' native/nativeshell.js - cd build - cmake -GNinja -DQTROOT=/usr/local/opt/qt@5 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=output .. - ninja install - - name: Fix library paths and create dmg - run: | - python3 ./scripts/fix-install-names.py ./build/output/Jellyfin\ Media\ Player.app - python3 ./scripts/fix-webengine.py ./build/output/Jellyfin\ Media\ Player.app - codesign --force --deep -s - ./build/output/Jellyfin\ Media\ Player.app/ - brew install create-dmg - create-dmg --volname "Jellyfin Media Player" --no-internet-enable "JellyfinMediaPlayer.dmg" "./build/output/Jellyfin Media Player.app" - - name: Archive production artifacts - uses: actions/upload-artifact@v4 - with: - name: macos - path: ${{ github.workspace }}/JellyfinMediaPlayer.dmg - - build-macarm64: - runs-on: macos-14 - steps: - - uses: actions/checkout@v4 - - name: Install dependencies - run: | - brew update - brew install ninja mpv qt@5 || true - - name: Release build - run: | - ./download_webclient.sh - sed -i '' 's|await loadScript('\''qrc:///qtwebchannel/qwebchannel.js'\'');|document.body.style.overscrollBehavior = "none";&|g' native/nativeshell.js - cd build - cmake -GNinja -DQTROOT=/opt/homebrew/opt/qt@5 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=output .. - ninja install - - name: Fix library paths and create dmg - run: | - python3 ./scripts/fix-install-names.py ./build/output/Jellyfin\ Media\ Player.app - python3 ./scripts/fix-webengine.py ./build/output/Jellyfin\ Media\ Player.app - codesign --force --deep -s - ./build/output/Jellyfin\ Media\ Player.app/ - brew install create-dmg - create-dmg --volname "Jellyfin Media Player" --no-internet-enable "JellyfinMediaPlayer.dmg" "./build/output/Jellyfin Media Player.app" - - name: Archive production artifacts - uses: actions/upload-artifact@v4 - with: - name: macos-arm64 - path: ${{ github.workspace }}/JellyfinMediaPlayer.dmg - build-win64: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - name: Install Qt 5.15.2 + - name: Install Qt 5.15.* uses: jurplel/install-qt-action@v3 with: - version: "5.15.2" + version: "5.15.*" arch: "win64_msvc2019_64" modules: "qtwebengine" - name: Install dependencies @@ -78,7 +20,7 @@ jobs: ./download_webclient.sh curl -L https://aka.ms/vs/17/release/vc_redist.x64.exe > vc_redist.x64.exe sed -i 's#C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Redist\\MSVC\\v142\\vcredist_x64.exe#'"$(readlink -f vc_redist.x64.exe | sed 's#/\([a-z]\)/#\1:\\#g' | tr '/' '\\' | sed 's/\\/\\\\/g')#g" bundle/win/Bundle.wxs - curl -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip > ninja.zip + curl -L https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip > ninja.zip unzip ninja.zip mv ninja.exe build/ curl -L https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20240513/mpv-dev-x86_64-20240513-git-61f72bd.7z > mpv.7z @@ -106,81 +48,3 @@ jobs: with: name: windows path: ${{ github.workspace }}/build/JellyfinMediaPlayer-*.exe - - build-win32: - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - - name: Install Qt 5.15.2 - uses: jurplel/install-qt-action@v3 - with: - version: "5.15.2" - arch: "win32_msvc2019" - modules: "qtwebengine" - - name: Install dependencies - run: | - ./download_webclient.sh - curl -L https://aka.ms/vs/17/release/vc_redist.x86.exe > vc_redist.x86.exe - sed -i 's#C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC\\Redist\\MSVC\\v142\\vcredist_x64.exe#'"$(readlink -f vc_redist.x86.exe | sed 's#/\([a-z]\)/#\1:\\#g' | tr '/' '\\' | sed 's/\\/\\\\/g')#g" bundle/win/Bundle.wxs - curl -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip > ninja.zip - unzip ninja.zip - mv ninja.exe build/ - curl -L https://github.com/shinchiro/mpv-winbuild-cmake/releases/download/20240513/mpv-dev-i686-20240513-git-61f72bd.7z > mpv.7z - 7z x mpv.7z - mkdir mpv - mv include mpv - gendef libmpv-2.dll - mv libmpv-2.dll mpv/libmpv-2.dll - mv libmpv-2.def mpv.def - mv mpv.def libmpv.dll.a mpv/ - mv mpv build/ - shell: bash - - name: Build - run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" - cd build - set PATH=%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin;%CD% - cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=output -DCMAKE_MAKE_PROGRAM=ninja.exe -DQTROOT=%Qt5_DIR% -DMPV_INCLUDE_DIR=mpv/include -DMPV_LIBRARY=mpv/libmpv-2.dll -DCMAKE_INSTALL_PREFIX=output .. - lib /def:mpv\mpv.def /out:mpv\libmpv-2.dll.lib /MACHINE:X86 - ninja - ninja windows_package - shell: cmd - - name: Archive production artifacts - uses: actions/upload-artifact@v4 - with: - name: windows-legacy32 - path: ${{ github.workspace }}/build/JellyfinMediaPlayer-*.exe - - build-ubuntu: - strategy: - matrix: - tag: [mantic, noble, jammy] - runs-on: "ubuntu-latest" - steps: - - uses: actions/checkout@v4 - - name: Docker Build - run: | - docker build -f deployment/Dockerfile.debian -t builddeb --build-arg TAG=${{ matrix.tag }} --build-arg IMG=ubuntu deployment - docker run -v $(pwd)/deployment/dist:/dist -v $(pwd):/jellyfin -e TAG=${{ matrix.tag }} builddeb - - name: Archive production artifacts - uses: actions/upload-artifact@v4 - with: - name: ubuntu-${{ matrix.tag }} - path: ${{ github.workspace }}/deployment/dist/* - - build-debian: - strategy: - matrix: - tag: [bookworm, trixie] - runs-on: "ubuntu-latest" - steps: - - uses: actions/checkout@v4 - - name: Docker Build - run: | - docker build -f deployment/Dockerfile.debian -t builddeb --build-arg TAG=${{ matrix.tag }} deployment - docker run -v $(pwd)/deployment/dist:/dist -v $(pwd):/jellyfin -e TAG=${{ matrix.tag }} builddeb - - name: Archive production artifacts - uses: actions/upload-artifact@v4 - with: - name: debian-${{ matrix.tag }} - path: ${{ github.workspace }}/deployment/dist/*