From 15f7c33a12f1676560f624b3f4291f5b643266b2 Mon Sep 17 00:00:00 2001 From: Christian Feldmann Date: Tue, 28 Apr 2026 08:27:53 +0200 Subject: [PATCH 1/5] Update to Gnome 50 image --- .github/workflows/flatpak.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 6ee4a5e41..87e2769ad 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -22,7 +22,7 @@ jobs: name: "Flatpak Builder" runs-on: ubuntu-latest container: - image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48 + image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-50 options: --privileged steps: - uses: actions/checkout@v6 @@ -31,7 +31,7 @@ jobs: bundle: "YUView.flatpak" manifest-path: "de.rwth_aachen.ient.YUView.yaml" - name: Upload Release - uses: actions/upload-release-asset@v1.0.1 + uses: actions/upload-release-asset@v1.0.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From e0c75f2adc62931472f7ffa8b37528c97a954627 Mon Sep 17 00:00:00 2001 From: Christian Feldmann Date: Tue, 28 Apr 2026 08:44:48 +0200 Subject: [PATCH 2/5] Test updated flatpack build --- .github/workflows/Build.yml | 500 ++++++++++++++++---------------- .github/workflows/flatpak.yml | 2 +- de.rwth_aachen.ient.YUView.yaml | 2 +- 3 files changed, 252 insertions(+), 252 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 7b1a4fed1..80b192049 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -1,253 +1,253 @@ -name: CI build +# name: CI build -on: - push: - release: - types: - - created +# on: +# push: +# release: +# types: +# - created -jobs: - build-unix-native: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm] - steps: - - uses: actions/checkout@v6 - with: - submodules: true - - run: git fetch --prune --unshallow - - name: Install Linux packages - run: | - sudo apt-get update - sudo apt-get install qt6-base-dev - - name: Build - run: | - cd $GITHUB_WORKSPACE - mkdir build - cd build - qmake6 CONFIG+=UNITTESTS .. - make -j$(nproc) - - name: Run Unittests - run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest - env: - QT_QPA_PLATFORM: 'offscreen' - build-mac-native: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-15, macos-15-intel] - steps: - - uses: actions/checkout@v6 - with: - submodules: true - - run: git fetch --prune --unshallow - - name: Install packages - run: brew install qt - - name: Build - run: | - cd $GITHUB_WORKSPACE - mkdir build - cd build - qmake6 CONFIG+=UNITTESTS .. - make -j $(sysctl -n hw.logicalcpu) - - name: Run Unittests - run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest - env: - QT_QPA_PLATFORM: 'offscreen' - build-linux-mac: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-22.04, macos-15] - steps: - - uses: actions/checkout@v6 - with: - submodules: true - - run: git fetch --prune --unshallow - - name: Set artifact name - id: artifacts - shell: bash - run: | - echo "qt=qtBase-6-9-0-${{ matrix.os }}" >> "$GITHUB_OUTPUT" - echo "outputZip=YUView-${{ matrix.os }}.zip" >> "$GITHUB_OUTPUT" - - name: Install Qt base - run: | - cd ../../ - mkdir -p YUViewQt/YUViewQt - cd YUViewQt/YUViewQt - curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/${{steps.artifacts.outputs.qt}}.zip -o Qt.zip - unzip -qa Qt.zip - echo "$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin" >> $GITHUB_PATH - shell: bash - - name: Install Linuxdeployqt - if: runner.os == 'Linux' - run: | - curl -L https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage -o linuxdeployqt-6-x86_64.AppImage - chmod a+x linuxdeployqt-6-x86_64.AppImage - - name: Install Linux packages - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt-get install libgl1-mesa-dev libxkbcommon-x11-0 libpcre2-16-0 '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libatspi2.0-dev libfuse2 - - name: Download libde265 (Linux) - if: runner.os == 'Linux' - run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.so -o libde265-internals.so - - name: Download libde265 (Mac) - if: runner.os == 'macOS' - run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dylib -o libde265-internals.dylib - - name: Download libde265 license file - run: curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt - shell: bash - - name: Build (Qmake + Make) - run: | - cd $GITHUB_WORKSPACE - export PATH=$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin:$PATH - mkdir build - cd build - qmake CONFIG+=UNITTESTS .. - make -j 4 - - name: Run Unittests - run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest - env: - QT_QPA_PLATFORM: 'offscreen' - - name: Build App (Mac) - if: runner.os == 'macOS' - run: | - macdeployqt build/YUViewApp/YUView.app -always-overwrite -verbose=2 - cp libde265-internals.dylib build/YUViewApp/YUView.app/Contents/MacOS/. - cd build/YUViewApp - # Zip - zip -r ${{steps.artifacts.outputs.outputZip}} YUView.app/ - mkdir $GITHUB_WORKSPACE/artifacts - cp ${{steps.artifacts.outputs.outputZip}} $GITHUB_WORKSPACE/artifacts/ - - name: Build Appimage (Linux) - if: runner.os == 'Linux' - run: | - cd build - make INSTALL_ROOT=appdir install - $GITHUB_WORKSPACE/linuxdeployqt-6-x86_64.AppImage YUViewApp/appdir/usr/local/share/applications/de.rwth_aachen.ient.YUView.desktop -appimage -bundle-non-qt-libs -verbose=2 - mv YUView-*.AppImage YUView.AppImage - mkdir $GITHUB_WORKSPACE/artifacts - cp YUView.AppImage $GITHUB_WORKSPACE/artifacts/ - - name: Upload Artifact - uses: actions/upload-artifact@v7 - with: - name: ${{steps.artifacts.outputs.outputZip}} - path: artifacts - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: artifacts/${{steps.artifacts.outputs.outputZip}} - build-windows: - runs-on: windows-2022 - strategy: - matrix: - autoUpdate: [true, false] - steps: - - uses: actions/checkout@v6 - with: - submodules: true - - uses: ilammy/msvc-dev-cmd@v1 - - run: git fetch --prune --unshallow - - name: Install Qt base - run: | - cd ../../ - mkdir -p YUViewQt/YUViewQt - cd YUViewQt/YUViewQt - curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/qtBase-6-9-0-windows-2022.zip -o Qt.zip - 7z x Qt.zip - echo "${{ github.workspace }}\..\..\YUViewQt\YUViewQt\Qt\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - - name: Test qmake - run : qmake --version - - name: Install libde265 - run: | - curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dll -o libde265.dll - curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt - - name: Install jom - run: | - choco install jom - - name: Install openSSL - run: | - mkdir openSSL - cd openSSL - curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/openSSL3.5.0/openSSL-3-5-0-windows-2022.zip -o openSSL.zip - 7z x openSSL.zip - cd .. - - name: Activate auto update - if: matrix.autoUpdate == true - run: sed -i -- "s/#define UPDATE_FEATURE_ENABLE 0/#define UPDATE_FEATURE_ENABLE 1/g" YUViewLib/src/common/Typedef.h - shell: bash - - name: Build - run: | - echo "Creating Build dir and entering it" - mkdir build - cd build - echo "Executing qmake..." - qmake CONFIG+=UNITTESTS .. - echo "Executing jom:" - jom - - name: Run Unittests - run: ${{ github.workspace }}\build\YUViewUnitTest\YUViewUnitTest - env: - QT_QPA_PLATFORM: 'offscreen' - - name: WindeployQT - run: | - mkdir deploy - cd deploy - cp ../build/YUViewApp/YUView.exe . - windeployqt --release --no-compiler-runtime YUView.exe - cp ../openSSL/*.dll . - mkdir decoder - cp ..\libde265.dll decoder - cp ..\libde265License.txt decoder - cp ../LICENSE.GPL3 . - cd .. - python deployment/versioning.py -d deploy -o deploy/versioninfo.txt - mkdir artifacts - 7z a artifacts/YUView-Win.zip ./deploy/* - - name: Wix Windows - if: matrix.autoUpdate == true - run: | - cd ${{ github.workspace }}/deployment/wix - cp 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm' . - & "C:\Program Files (x86)\WiX Toolset v3.14\bin\heat.exe" dir ../../deploy -gg -dr APPLICATIONFOLDER -srd -sreg -cg YUViewComponents -out harvestedDirectory.wxs - & "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" -dConfiguration=Release -dOutDir=bin/Release/ '-dTargetExt=.msi' '-dTargetFileName=YUViewSetup.msi' -dTargetName=YUViewSetup -out obj/Release/ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll" YUView.wxs - & "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" -dConfiguration=Release -dOutDir=bin/Release/ '-dTargetExt=.msi' '-dTargetFileName=YUViewSetup.msi' -dTargetName=YUViewSetup -out obj/Release/ -arch x64 harvestedDirectory.wxs - & "C:\Program Files (x86)\WiX Toolset v3.14\bin\light.exe" -b ../../deploy -out bin/Release/YUViewSetup.msi -pdbout bin/Release/YUViewSetup.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll" -contentsfile obj/Release/YUViewSetup.wixproj.BindContentsFileListnull.txt -outputsfile obj/Release/YUViewSetup.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj/Release/YUViewSetup.wixproj.BindBuiltOutputsFileListnull.txt obj/Release/YUView.wixobj obj/Release/harvestedDirectory.wixobj - cd ${{ github.workspace }} - cp deployment/wix/bin/Release/YUViewSetup.msi ./ - - name: Upload Artifact (Autoupdate) - if: matrix.autoUpdate == true - uses: actions/upload-artifact@v7 - with: - name: YUView-windows-2022-autoupdate.zip - path: artifacts - - name: Upload Artifact (Autoupdate disabled) - if: matrix.autoUpdate == false - uses: actions/upload-artifact@v7 - with: - name: YUView-windows-2022.zip - path: artifacts - - name: Upload Windows installer Artifact - if: matrix.autoUpdate == true - uses: actions/upload-artifact@v7 - with: - name: YYUView-windows-2022.msi - path: ./YUViewSetup.msi - - name: Release Zip - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: artifacts/YUView-Win.zip - - name: Release Installer - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') && matrix.autoUpdate == true - with: - files: YUViewSetup.msi +# jobs: +# build-unix-native: +# runs-on: ${{ matrix.os }} +# strategy: +# matrix: +# os: [ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm] +# steps: +# - uses: actions/checkout@v6 +# with: +# submodules: true +# - run: git fetch --prune --unshallow +# - name: Install Linux packages +# run: | +# sudo apt-get update +# sudo apt-get install qt6-base-dev +# - name: Build +# run: | +# cd $GITHUB_WORKSPACE +# mkdir build +# cd build +# qmake6 CONFIG+=UNITTESTS .. +# make -j$(nproc) +# - name: Run Unittests +# run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest +# env: +# QT_QPA_PLATFORM: 'offscreen' +# build-mac-native: +# runs-on: ${{ matrix.os }} +# strategy: +# matrix: +# os: [macos-15, macos-15-intel] +# steps: +# - uses: actions/checkout@v6 +# with: +# submodules: true +# - run: git fetch --prune --unshallow +# - name: Install packages +# run: brew install qt +# - name: Build +# run: | +# cd $GITHUB_WORKSPACE +# mkdir build +# cd build +# qmake6 CONFIG+=UNITTESTS .. +# make -j $(sysctl -n hw.logicalcpu) +# - name: Run Unittests +# run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest +# env: +# QT_QPA_PLATFORM: 'offscreen' +# build-linux-mac: +# runs-on: ${{ matrix.os }} +# strategy: +# matrix: +# os: [ubuntu-22.04, macos-15] +# steps: +# - uses: actions/checkout@v6 +# with: +# submodules: true +# - run: git fetch --prune --unshallow +# - name: Set artifact name +# id: artifacts +# shell: bash +# run: | +# echo "qt=qtBase-6-9-0-${{ matrix.os }}" >> "$GITHUB_OUTPUT" +# echo "outputZip=YUView-${{ matrix.os }}.zip" >> "$GITHUB_OUTPUT" +# - name: Install Qt base +# run: | +# cd ../../ +# mkdir -p YUViewQt/YUViewQt +# cd YUViewQt/YUViewQt +# curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/${{steps.artifacts.outputs.qt}}.zip -o Qt.zip +# unzip -qa Qt.zip +# echo "$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin" >> $GITHUB_PATH +# shell: bash +# - name: Install Linuxdeployqt +# if: runner.os == 'Linux' +# run: | +# curl -L https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage -o linuxdeployqt-6-x86_64.AppImage +# chmod a+x linuxdeployqt-6-x86_64.AppImage +# - name: Install Linux packages +# if: runner.os == 'Linux' +# run: | +# sudo apt-get update +# sudo apt-get install libgl1-mesa-dev libxkbcommon-x11-0 libpcre2-16-0 '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libatspi2.0-dev libfuse2 +# - name: Download libde265 (Linux) +# if: runner.os == 'Linux' +# run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.so -o libde265-internals.so +# - name: Download libde265 (Mac) +# if: runner.os == 'macOS' +# run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dylib -o libde265-internals.dylib +# - name: Download libde265 license file +# run: curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt +# shell: bash +# - name: Build (Qmake + Make) +# run: | +# cd $GITHUB_WORKSPACE +# export PATH=$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin:$PATH +# mkdir build +# cd build +# qmake CONFIG+=UNITTESTS .. +# make -j 4 +# - name: Run Unittests +# run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest +# env: +# QT_QPA_PLATFORM: 'offscreen' +# - name: Build App (Mac) +# if: runner.os == 'macOS' +# run: | +# macdeployqt build/YUViewApp/YUView.app -always-overwrite -verbose=2 +# cp libde265-internals.dylib build/YUViewApp/YUView.app/Contents/MacOS/. +# cd build/YUViewApp +# # Zip +# zip -r ${{steps.artifacts.outputs.outputZip}} YUView.app/ +# mkdir $GITHUB_WORKSPACE/artifacts +# cp ${{steps.artifacts.outputs.outputZip}} $GITHUB_WORKSPACE/artifacts/ +# - name: Build Appimage (Linux) +# if: runner.os == 'Linux' +# run: | +# cd build +# make INSTALL_ROOT=appdir install +# $GITHUB_WORKSPACE/linuxdeployqt-6-x86_64.AppImage YUViewApp/appdir/usr/local/share/applications/de.rwth_aachen.ient.YUView.desktop -appimage -bundle-non-qt-libs -verbose=2 +# mv YUView-*.AppImage YUView.AppImage +# mkdir $GITHUB_WORKSPACE/artifacts +# cp YUView.AppImage $GITHUB_WORKSPACE/artifacts/ +# - name: Upload Artifact +# uses: actions/upload-artifact@v7 +# with: +# name: ${{steps.artifacts.outputs.outputZip}} +# path: artifacts +# - name: Release +# uses: softprops/action-gh-release@v1 +# if: startsWith(github.ref, 'refs/tags/') +# with: +# files: artifacts/${{steps.artifacts.outputs.outputZip}} +# build-windows: +# runs-on: windows-2022 +# strategy: +# matrix: +# autoUpdate: [true, false] +# steps: +# - uses: actions/checkout@v6 +# with: +# submodules: true +# - uses: ilammy/msvc-dev-cmd@v1 +# - run: git fetch --prune --unshallow +# - name: Install Qt base +# run: | +# cd ../../ +# mkdir -p YUViewQt/YUViewQt +# cd YUViewQt/YUViewQt +# curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/qtBase-6-9-0-windows-2022.zip -o Qt.zip +# 7z x Qt.zip +# echo "${{ github.workspace }}\..\..\YUViewQt\YUViewQt\Qt\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append +# - name: Test qmake +# run : qmake --version +# - name: Install libde265 +# run: | +# curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dll -o libde265.dll +# curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt +# - name: Install jom +# run: | +# choco install jom +# - name: Install openSSL +# run: | +# mkdir openSSL +# cd openSSL +# curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/openSSL3.5.0/openSSL-3-5-0-windows-2022.zip -o openSSL.zip +# 7z x openSSL.zip +# cd .. +# - name: Activate auto update +# if: matrix.autoUpdate == true +# run: sed -i -- "s/#define UPDATE_FEATURE_ENABLE 0/#define UPDATE_FEATURE_ENABLE 1/g" YUViewLib/src/common/Typedef.h +# shell: bash +# - name: Build +# run: | +# echo "Creating Build dir and entering it" +# mkdir build +# cd build +# echo "Executing qmake..." +# qmake CONFIG+=UNITTESTS .. +# echo "Executing jom:" +# jom +# - name: Run Unittests +# run: ${{ github.workspace }}\build\YUViewUnitTest\YUViewUnitTest +# env: +# QT_QPA_PLATFORM: 'offscreen' +# - name: WindeployQT +# run: | +# mkdir deploy +# cd deploy +# cp ../build/YUViewApp/YUView.exe . +# windeployqt --release --no-compiler-runtime YUView.exe +# cp ../openSSL/*.dll . +# mkdir decoder +# cp ..\libde265.dll decoder +# cp ..\libde265License.txt decoder +# cp ../LICENSE.GPL3 . +# cd .. +# python deployment/versioning.py -d deploy -o deploy/versioninfo.txt +# mkdir artifacts +# 7z a artifacts/YUView-Win.zip ./deploy/* +# - name: Wix Windows +# if: matrix.autoUpdate == true +# run: | +# cd ${{ github.workspace }}/deployment/wix +# cp 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm' . +# & "C:\Program Files (x86)\WiX Toolset v3.14\bin\heat.exe" dir ../../deploy -gg -dr APPLICATIONFOLDER -srd -sreg -cg YUViewComponents -out harvestedDirectory.wxs +# & "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" -dConfiguration=Release -dOutDir=bin/Release/ '-dTargetExt=.msi' '-dTargetFileName=YUViewSetup.msi' -dTargetName=YUViewSetup -out obj/Release/ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll" YUView.wxs +# & "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" -dConfiguration=Release -dOutDir=bin/Release/ '-dTargetExt=.msi' '-dTargetFileName=YUViewSetup.msi' -dTargetName=YUViewSetup -out obj/Release/ -arch x64 harvestedDirectory.wxs +# & "C:\Program Files (x86)\WiX Toolset v3.14\bin\light.exe" -b ../../deploy -out bin/Release/YUViewSetup.msi -pdbout bin/Release/YUViewSetup.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll" -contentsfile obj/Release/YUViewSetup.wixproj.BindContentsFileListnull.txt -outputsfile obj/Release/YUViewSetup.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj/Release/YUViewSetup.wixproj.BindBuiltOutputsFileListnull.txt obj/Release/YUView.wixobj obj/Release/harvestedDirectory.wixobj +# cd ${{ github.workspace }} +# cp deployment/wix/bin/Release/YUViewSetup.msi ./ +# - name: Upload Artifact (Autoupdate) +# if: matrix.autoUpdate == true +# uses: actions/upload-artifact@v7 +# with: +# name: YUView-windows-2022-autoupdate.zip +# path: artifacts +# - name: Upload Artifact (Autoupdate disabled) +# if: matrix.autoUpdate == false +# uses: actions/upload-artifact@v7 +# with: +# name: YUView-windows-2022.zip +# path: artifacts +# - name: Upload Windows installer Artifact +# if: matrix.autoUpdate == true +# uses: actions/upload-artifact@v7 +# with: +# name: YYUView-windows-2022.msi +# path: ./YUViewSetup.msi +# - name: Release Zip +# uses: softprops/action-gh-release@v1 +# if: startsWith(github.ref, 'refs/tags/') +# with: +# files: artifacts/YUView-Win.zip +# - name: Release Installer +# uses: softprops/action-gh-release@v1 +# if: startsWith(github.ref, 'refs/tags/') && matrix.autoUpdate == true +# with: +# files: YUViewSetup.msi - # How to upload files to the release: - # https://github.com/Blacksmoke16/oq/pull/47/files#diff-082c28d748ad2e3eecc5508d740d9417R9-R29 - # Mime type list - # https://www.iana.org/assignments/media-types/media-types.xhtml +# # How to upload files to the release: +# # https://github.com/Blacksmoke16/oq/pull/47/files#diff-082c28d748ad2e3eecc5508d740d9417R9-R29 +# # Mime type list +# # https://www.iana.org/assignments/media-types/media-types.xhtml diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 87e2769ad..e1b14c024 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -8,7 +8,7 @@ on: # Since the workflow takes significantly longer (because of the ffmpeg build) we want to execute # this as little as possible. push: - branches: [ develop ] + branches: [ develop, update/flatpackBuild ] release: branches: [ develop ] types: diff --git a/de.rwth_aachen.ient.YUView.yaml b/de.rwth_aachen.ient.YUView.yaml index 2454b9688..15702ae6a 100644 --- a/de.rwth_aachen.ient.YUView.yaml +++ b/de.rwth_aachen.ient.YUView.yaml @@ -1,6 +1,6 @@ app-id: de.rwth_aachen.ient.YUView runtime: org.kde.Platform -runtime-version: '5.14' +runtime-version: '6.7' sdk: org.kde.Sdk command: YUView finish-args: From bcd0bcf058fbb44213448b19500c900fb107d2a6 Mon Sep 17 00:00:00 2001 From: Christian Feldmann Date: Tue, 28 Apr 2026 09:28:08 +0200 Subject: [PATCH 3/5] Update sdk and ffmpeg --- de.rwth_aachen.ient.YUView.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de.rwth_aachen.ient.YUView.yaml b/de.rwth_aachen.ient.YUView.yaml index 15702ae6a..f9791767f 100644 --- a/de.rwth_aachen.ient.YUView.yaml +++ b/de.rwth_aachen.ient.YUView.yaml @@ -1,6 +1,6 @@ app-id: de.rwth_aachen.ient.YUView runtime: org.kde.Platform -runtime-version: '6.7' +runtime-version: '6.9' sdk: org.kde.Sdk command: YUView finish-args: @@ -35,8 +35,8 @@ modules: - --enable-encoder=png sources: - type: archive - url: https://www.ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz - sha256: 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31 + url: https://www.ffmpeg.org/releases/ffmpeg-7.1.2.tar.xz + sha256: 089bc60fb59d6aecc5d994ff530fd0dcb3ee39aa55867849a2bbc4e555f9c304 cleanup: - /share/ffmpeg/examples From 7618814bb116b088d5ef035387156ee07dcdfed9 Mon Sep 17 00:00:00 2001 From: Christian Feldmann Date: Tue, 28 Apr 2026 09:58:50 +0200 Subject: [PATCH 4/5] Reenable --- .github/workflows/Build.yml | 500 ++++++++++++++++++------------------ 1 file changed, 250 insertions(+), 250 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 80b192049..7b1a4fed1 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -1,253 +1,253 @@ -# name: CI build +name: CI build -# on: -# push: -# release: -# types: -# - created +on: + push: + release: + types: + - created -# jobs: -# build-unix-native: -# runs-on: ${{ matrix.os }} -# strategy: -# matrix: -# os: [ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm] -# steps: -# - uses: actions/checkout@v6 -# with: -# submodules: true -# - run: git fetch --prune --unshallow -# - name: Install Linux packages -# run: | -# sudo apt-get update -# sudo apt-get install qt6-base-dev -# - name: Build -# run: | -# cd $GITHUB_WORKSPACE -# mkdir build -# cd build -# qmake6 CONFIG+=UNITTESTS .. -# make -j$(nproc) -# - name: Run Unittests -# run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest -# env: -# QT_QPA_PLATFORM: 'offscreen' -# build-mac-native: -# runs-on: ${{ matrix.os }} -# strategy: -# matrix: -# os: [macos-15, macos-15-intel] -# steps: -# - uses: actions/checkout@v6 -# with: -# submodules: true -# - run: git fetch --prune --unshallow -# - name: Install packages -# run: brew install qt -# - name: Build -# run: | -# cd $GITHUB_WORKSPACE -# mkdir build -# cd build -# qmake6 CONFIG+=UNITTESTS .. -# make -j $(sysctl -n hw.logicalcpu) -# - name: Run Unittests -# run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest -# env: -# QT_QPA_PLATFORM: 'offscreen' -# build-linux-mac: -# runs-on: ${{ matrix.os }} -# strategy: -# matrix: -# os: [ubuntu-22.04, macos-15] -# steps: -# - uses: actions/checkout@v6 -# with: -# submodules: true -# - run: git fetch --prune --unshallow -# - name: Set artifact name -# id: artifacts -# shell: bash -# run: | -# echo "qt=qtBase-6-9-0-${{ matrix.os }}" >> "$GITHUB_OUTPUT" -# echo "outputZip=YUView-${{ matrix.os }}.zip" >> "$GITHUB_OUTPUT" -# - name: Install Qt base -# run: | -# cd ../../ -# mkdir -p YUViewQt/YUViewQt -# cd YUViewQt/YUViewQt -# curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/${{steps.artifacts.outputs.qt}}.zip -o Qt.zip -# unzip -qa Qt.zip -# echo "$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin" >> $GITHUB_PATH -# shell: bash -# - name: Install Linuxdeployqt -# if: runner.os == 'Linux' -# run: | -# curl -L https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage -o linuxdeployqt-6-x86_64.AppImage -# chmod a+x linuxdeployqt-6-x86_64.AppImage -# - name: Install Linux packages -# if: runner.os == 'Linux' -# run: | -# sudo apt-get update -# sudo apt-get install libgl1-mesa-dev libxkbcommon-x11-0 libpcre2-16-0 '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libatspi2.0-dev libfuse2 -# - name: Download libde265 (Linux) -# if: runner.os == 'Linux' -# run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.so -o libde265-internals.so -# - name: Download libde265 (Mac) -# if: runner.os == 'macOS' -# run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dylib -o libde265-internals.dylib -# - name: Download libde265 license file -# run: curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt -# shell: bash -# - name: Build (Qmake + Make) -# run: | -# cd $GITHUB_WORKSPACE -# export PATH=$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin:$PATH -# mkdir build -# cd build -# qmake CONFIG+=UNITTESTS .. -# make -j 4 -# - name: Run Unittests -# run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest -# env: -# QT_QPA_PLATFORM: 'offscreen' -# - name: Build App (Mac) -# if: runner.os == 'macOS' -# run: | -# macdeployqt build/YUViewApp/YUView.app -always-overwrite -verbose=2 -# cp libde265-internals.dylib build/YUViewApp/YUView.app/Contents/MacOS/. -# cd build/YUViewApp -# # Zip -# zip -r ${{steps.artifacts.outputs.outputZip}} YUView.app/ -# mkdir $GITHUB_WORKSPACE/artifacts -# cp ${{steps.artifacts.outputs.outputZip}} $GITHUB_WORKSPACE/artifacts/ -# - name: Build Appimage (Linux) -# if: runner.os == 'Linux' -# run: | -# cd build -# make INSTALL_ROOT=appdir install -# $GITHUB_WORKSPACE/linuxdeployqt-6-x86_64.AppImage YUViewApp/appdir/usr/local/share/applications/de.rwth_aachen.ient.YUView.desktop -appimage -bundle-non-qt-libs -verbose=2 -# mv YUView-*.AppImage YUView.AppImage -# mkdir $GITHUB_WORKSPACE/artifacts -# cp YUView.AppImage $GITHUB_WORKSPACE/artifacts/ -# - name: Upload Artifact -# uses: actions/upload-artifact@v7 -# with: -# name: ${{steps.artifacts.outputs.outputZip}} -# path: artifacts -# - name: Release -# uses: softprops/action-gh-release@v1 -# if: startsWith(github.ref, 'refs/tags/') -# with: -# files: artifacts/${{steps.artifacts.outputs.outputZip}} -# build-windows: -# runs-on: windows-2022 -# strategy: -# matrix: -# autoUpdate: [true, false] -# steps: -# - uses: actions/checkout@v6 -# with: -# submodules: true -# - uses: ilammy/msvc-dev-cmd@v1 -# - run: git fetch --prune --unshallow -# - name: Install Qt base -# run: | -# cd ../../ -# mkdir -p YUViewQt/YUViewQt -# cd YUViewQt/YUViewQt -# curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/qtBase-6-9-0-windows-2022.zip -o Qt.zip -# 7z x Qt.zip -# echo "${{ github.workspace }}\..\..\YUViewQt\YUViewQt\Qt\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append -# - name: Test qmake -# run : qmake --version -# - name: Install libde265 -# run: | -# curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dll -o libde265.dll -# curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt -# - name: Install jom -# run: | -# choco install jom -# - name: Install openSSL -# run: | -# mkdir openSSL -# cd openSSL -# curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/openSSL3.5.0/openSSL-3-5-0-windows-2022.zip -o openSSL.zip -# 7z x openSSL.zip -# cd .. -# - name: Activate auto update -# if: matrix.autoUpdate == true -# run: sed -i -- "s/#define UPDATE_FEATURE_ENABLE 0/#define UPDATE_FEATURE_ENABLE 1/g" YUViewLib/src/common/Typedef.h -# shell: bash -# - name: Build -# run: | -# echo "Creating Build dir and entering it" -# mkdir build -# cd build -# echo "Executing qmake..." -# qmake CONFIG+=UNITTESTS .. -# echo "Executing jom:" -# jom -# - name: Run Unittests -# run: ${{ github.workspace }}\build\YUViewUnitTest\YUViewUnitTest -# env: -# QT_QPA_PLATFORM: 'offscreen' -# - name: WindeployQT -# run: | -# mkdir deploy -# cd deploy -# cp ../build/YUViewApp/YUView.exe . -# windeployqt --release --no-compiler-runtime YUView.exe -# cp ../openSSL/*.dll . -# mkdir decoder -# cp ..\libde265.dll decoder -# cp ..\libde265License.txt decoder -# cp ../LICENSE.GPL3 . -# cd .. -# python deployment/versioning.py -d deploy -o deploy/versioninfo.txt -# mkdir artifacts -# 7z a artifacts/YUView-Win.zip ./deploy/* -# - name: Wix Windows -# if: matrix.autoUpdate == true -# run: | -# cd ${{ github.workspace }}/deployment/wix -# cp 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm' . -# & "C:\Program Files (x86)\WiX Toolset v3.14\bin\heat.exe" dir ../../deploy -gg -dr APPLICATIONFOLDER -srd -sreg -cg YUViewComponents -out harvestedDirectory.wxs -# & "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" -dConfiguration=Release -dOutDir=bin/Release/ '-dTargetExt=.msi' '-dTargetFileName=YUViewSetup.msi' -dTargetName=YUViewSetup -out obj/Release/ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll" YUView.wxs -# & "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" -dConfiguration=Release -dOutDir=bin/Release/ '-dTargetExt=.msi' '-dTargetFileName=YUViewSetup.msi' -dTargetName=YUViewSetup -out obj/Release/ -arch x64 harvestedDirectory.wxs -# & "C:\Program Files (x86)\WiX Toolset v3.14\bin\light.exe" -b ../../deploy -out bin/Release/YUViewSetup.msi -pdbout bin/Release/YUViewSetup.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll" -contentsfile obj/Release/YUViewSetup.wixproj.BindContentsFileListnull.txt -outputsfile obj/Release/YUViewSetup.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj/Release/YUViewSetup.wixproj.BindBuiltOutputsFileListnull.txt obj/Release/YUView.wixobj obj/Release/harvestedDirectory.wixobj -# cd ${{ github.workspace }} -# cp deployment/wix/bin/Release/YUViewSetup.msi ./ -# - name: Upload Artifact (Autoupdate) -# if: matrix.autoUpdate == true -# uses: actions/upload-artifact@v7 -# with: -# name: YUView-windows-2022-autoupdate.zip -# path: artifacts -# - name: Upload Artifact (Autoupdate disabled) -# if: matrix.autoUpdate == false -# uses: actions/upload-artifact@v7 -# with: -# name: YUView-windows-2022.zip -# path: artifacts -# - name: Upload Windows installer Artifact -# if: matrix.autoUpdate == true -# uses: actions/upload-artifact@v7 -# with: -# name: YYUView-windows-2022.msi -# path: ./YUViewSetup.msi -# - name: Release Zip -# uses: softprops/action-gh-release@v1 -# if: startsWith(github.ref, 'refs/tags/') -# with: -# files: artifacts/YUView-Win.zip -# - name: Release Installer -# uses: softprops/action-gh-release@v1 -# if: startsWith(github.ref, 'refs/tags/') && matrix.autoUpdate == true -# with: -# files: YUViewSetup.msi +jobs: + build-unix-native: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm] + steps: + - uses: actions/checkout@v6 + with: + submodules: true + - run: git fetch --prune --unshallow + - name: Install Linux packages + run: | + sudo apt-get update + sudo apt-get install qt6-base-dev + - name: Build + run: | + cd $GITHUB_WORKSPACE + mkdir build + cd build + qmake6 CONFIG+=UNITTESTS .. + make -j$(nproc) + - name: Run Unittests + run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest + env: + QT_QPA_PLATFORM: 'offscreen' + build-mac-native: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-15, macos-15-intel] + steps: + - uses: actions/checkout@v6 + with: + submodules: true + - run: git fetch --prune --unshallow + - name: Install packages + run: brew install qt + - name: Build + run: | + cd $GITHUB_WORKSPACE + mkdir build + cd build + qmake6 CONFIG+=UNITTESTS .. + make -j $(sysctl -n hw.logicalcpu) + - name: Run Unittests + run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest + env: + QT_QPA_PLATFORM: 'offscreen' + build-linux-mac: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-22.04, macos-15] + steps: + - uses: actions/checkout@v6 + with: + submodules: true + - run: git fetch --prune --unshallow + - name: Set artifact name + id: artifacts + shell: bash + run: | + echo "qt=qtBase-6-9-0-${{ matrix.os }}" >> "$GITHUB_OUTPUT" + echo "outputZip=YUView-${{ matrix.os }}.zip" >> "$GITHUB_OUTPUT" + - name: Install Qt base + run: | + cd ../../ + mkdir -p YUViewQt/YUViewQt + cd YUViewQt/YUViewQt + curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/${{steps.artifacts.outputs.qt}}.zip -o Qt.zip + unzip -qa Qt.zip + echo "$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin" >> $GITHUB_PATH + shell: bash + - name: Install Linuxdeployqt + if: runner.os == 'Linux' + run: | + curl -L https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage -o linuxdeployqt-6-x86_64.AppImage + chmod a+x linuxdeployqt-6-x86_64.AppImage + - name: Install Linux packages + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install libgl1-mesa-dev libxkbcommon-x11-0 libpcre2-16-0 '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libatspi2.0-dev libfuse2 + - name: Download libde265 (Linux) + if: runner.os == 'Linux' + run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.so -o libde265-internals.so + - name: Download libde265 (Mac) + if: runner.os == 'macOS' + run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dylib -o libde265-internals.dylib + - name: Download libde265 license file + run: curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt + shell: bash + - name: Build (Qmake + Make) + run: | + cd $GITHUB_WORKSPACE + export PATH=$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin:$PATH + mkdir build + cd build + qmake CONFIG+=UNITTESTS .. + make -j 4 + - name: Run Unittests + run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest + env: + QT_QPA_PLATFORM: 'offscreen' + - name: Build App (Mac) + if: runner.os == 'macOS' + run: | + macdeployqt build/YUViewApp/YUView.app -always-overwrite -verbose=2 + cp libde265-internals.dylib build/YUViewApp/YUView.app/Contents/MacOS/. + cd build/YUViewApp + # Zip + zip -r ${{steps.artifacts.outputs.outputZip}} YUView.app/ + mkdir $GITHUB_WORKSPACE/artifacts + cp ${{steps.artifacts.outputs.outputZip}} $GITHUB_WORKSPACE/artifacts/ + - name: Build Appimage (Linux) + if: runner.os == 'Linux' + run: | + cd build + make INSTALL_ROOT=appdir install + $GITHUB_WORKSPACE/linuxdeployqt-6-x86_64.AppImage YUViewApp/appdir/usr/local/share/applications/de.rwth_aachen.ient.YUView.desktop -appimage -bundle-non-qt-libs -verbose=2 + mv YUView-*.AppImage YUView.AppImage + mkdir $GITHUB_WORKSPACE/artifacts + cp YUView.AppImage $GITHUB_WORKSPACE/artifacts/ + - name: Upload Artifact + uses: actions/upload-artifact@v7 + with: + name: ${{steps.artifacts.outputs.outputZip}} + path: artifacts + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: artifacts/${{steps.artifacts.outputs.outputZip}} + build-windows: + runs-on: windows-2022 + strategy: + matrix: + autoUpdate: [true, false] + steps: + - uses: actions/checkout@v6 + with: + submodules: true + - uses: ilammy/msvc-dev-cmd@v1 + - run: git fetch --prune --unshallow + - name: Install Qt base + run: | + cd ../../ + mkdir -p YUViewQt/YUViewQt + cd YUViewQt/YUViewQt + curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/qtBase-6-9-0-windows-2022.zip -o Qt.zip + 7z x Qt.zip + echo "${{ github.workspace }}\..\..\YUViewQt\YUViewQt\Qt\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Test qmake + run : qmake --version + - name: Install libde265 + run: | + curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dll -o libde265.dll + curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt + - name: Install jom + run: | + choco install jom + - name: Install openSSL + run: | + mkdir openSSL + cd openSSL + curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/openSSL3.5.0/openSSL-3-5-0-windows-2022.zip -o openSSL.zip + 7z x openSSL.zip + cd .. + - name: Activate auto update + if: matrix.autoUpdate == true + run: sed -i -- "s/#define UPDATE_FEATURE_ENABLE 0/#define UPDATE_FEATURE_ENABLE 1/g" YUViewLib/src/common/Typedef.h + shell: bash + - name: Build + run: | + echo "Creating Build dir and entering it" + mkdir build + cd build + echo "Executing qmake..." + qmake CONFIG+=UNITTESTS .. + echo "Executing jom:" + jom + - name: Run Unittests + run: ${{ github.workspace }}\build\YUViewUnitTest\YUViewUnitTest + env: + QT_QPA_PLATFORM: 'offscreen' + - name: WindeployQT + run: | + mkdir deploy + cd deploy + cp ../build/YUViewApp/YUView.exe . + windeployqt --release --no-compiler-runtime YUView.exe + cp ../openSSL/*.dll . + mkdir decoder + cp ..\libde265.dll decoder + cp ..\libde265License.txt decoder + cp ../LICENSE.GPL3 . + cd .. + python deployment/versioning.py -d deploy -o deploy/versioninfo.txt + mkdir artifacts + 7z a artifacts/YUView-Win.zip ./deploy/* + - name: Wix Windows + if: matrix.autoUpdate == true + run: | + cd ${{ github.workspace }}/deployment/wix + cp 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm' . + & "C:\Program Files (x86)\WiX Toolset v3.14\bin\heat.exe" dir ../../deploy -gg -dr APPLICATIONFOLDER -srd -sreg -cg YUViewComponents -out harvestedDirectory.wxs + & "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" -dConfiguration=Release -dOutDir=bin/Release/ '-dTargetExt=.msi' '-dTargetFileName=YUViewSetup.msi' -dTargetName=YUViewSetup -out obj/Release/ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll" YUView.wxs + & "C:\Program Files (x86)\WiX Toolset v3.14\bin\candle.exe" -dConfiguration=Release -dOutDir=bin/Release/ '-dTargetExt=.msi' '-dTargetFileName=YUViewSetup.msi' -dTargetName=YUViewSetup -out obj/Release/ -arch x64 harvestedDirectory.wxs + & "C:\Program Files (x86)\WiX Toolset v3.14\bin\light.exe" -b ../../deploy -out bin/Release/YUViewSetup.msi -pdbout bin/Release/YUViewSetup.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll" -contentsfile obj/Release/YUViewSetup.wixproj.BindContentsFileListnull.txt -outputsfile obj/Release/YUViewSetup.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj/Release/YUViewSetup.wixproj.BindBuiltOutputsFileListnull.txt obj/Release/YUView.wixobj obj/Release/harvestedDirectory.wixobj + cd ${{ github.workspace }} + cp deployment/wix/bin/Release/YUViewSetup.msi ./ + - name: Upload Artifact (Autoupdate) + if: matrix.autoUpdate == true + uses: actions/upload-artifact@v7 + with: + name: YUView-windows-2022-autoupdate.zip + path: artifacts + - name: Upload Artifact (Autoupdate disabled) + if: matrix.autoUpdate == false + uses: actions/upload-artifact@v7 + with: + name: YUView-windows-2022.zip + path: artifacts + - name: Upload Windows installer Artifact + if: matrix.autoUpdate == true + uses: actions/upload-artifact@v7 + with: + name: YYUView-windows-2022.msi + path: ./YUViewSetup.msi + - name: Release Zip + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: artifacts/YUView-Win.zip + - name: Release Installer + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') && matrix.autoUpdate == true + with: + files: YUViewSetup.msi -# # How to upload files to the release: -# # https://github.com/Blacksmoke16/oq/pull/47/files#diff-082c28d748ad2e3eecc5508d740d9417R9-R29 -# # Mime type list -# # https://www.iana.org/assignments/media-types/media-types.xhtml + # How to upload files to the release: + # https://github.com/Blacksmoke16/oq/pull/47/files#diff-082c28d748ad2e3eecc5508d740d9417R9-R29 + # Mime type list + # https://www.iana.org/assignments/media-types/media-types.xhtml From 8cabcc02193cd4bb439637d858754113d7c2de22 Mon Sep 17 00:00:00 2001 From: Christian Feldmann Date: Tue, 28 Apr 2026 09:59:11 +0200 Subject: [PATCH 5/5] Again run flatpack CI only on merge to develop --- .github/workflows/flatpak.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index e1b14c024..87e2769ad 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -8,7 +8,7 @@ on: # Since the workflow takes significantly longer (because of the ffmpeg build) we want to execute # this as little as possible. push: - branches: [ develop, update/flatpackBuild ] + branches: [ develop ] release: branches: [ develop ] types: