Adds macOS theme switch listening

.github/workflows/build.yml

@@ -38,9 +38,18 @@ jobs:
     runs-on: ubuntu-latest
     container:
       # image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08
-      image: exactlyonekas/gittyup-flatpak-builder:latest
+      image: archlinux:latest
       options: --privileged
     steps:
+
+    - name: Update
+      run: |
+        pacman --noconfirm -Suy
+        pacman --noconfirm -S flatpak flatpak-builder xorg-server-xvfb
+        flatpak install --assumeyes org.kde.Sdk//5.15-21.08
+        flatpak install --assumeyes org.freedesktop.Sdk.Extension.golang//21.08
+        flatpak install --assumeyes org.kde.Platform//5.15-21.08
+
     - name: Show environment variables
       run: >
         echo IS_RELEASE: ${{ env.IS_RELEASE }}
@@ -64,10 +73,16 @@ jobs:
         owner: 'flathub'
         repository: 'com.github.Murmele.Gittyup'
 
+    # just until the new release is out
+    - name: Checkout restructureCMake
+      run: |
+        cd com.github.Murmele.Gittyup
+        git checkout Qt6
+
     - name: Replace git tag by the commit id on which it runs
       if: github.ref_type != 'tag'
       run: >
-        sed -i 's@tag: gittyup_v[1-9]*.[0-9]*.[0-9]*@commit: "${{ (github.event.pull_request && github.event.pull_request.head.sha) || github.sha }}"@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+        sed -i 's@tag: .*@commit: "${{ (github.event.pull_request && github.event.pull_request.head.sha) || github.sha }}"@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
 
     - name: Use correct git tag
       if: github.ref_type == 'tag'
@@ -88,6 +103,11 @@ jobs:
       run: >
         sed -i 's@desktop-file-name-suffix: ""@desktop-file-name-suffix: " (Development)"@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
 
+    - name: Enable automatic update
+      if: github.ref_type != 'tag'
+      run: >
+        sed -i 's@-DENABLE_UPDATE_OVER_GUI=OFF@-DENABLE_UPDATE_OVER_GUI=ON@' com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
+
     - name: Show Flatpak manifest
       run: cat com.github.Murmele.Gittyup/com.github.Murmele.Gittyup.yml
 
@@ -112,19 +132,18 @@ jobs:
       fail-fast: false
       matrix:
         qt:
-          - version: 5.15.2
-            check_only: false
-
-          - version: 5.12.0
-            check_only: true
+          - version: 6.5.3
 
         env:
           - name: linux
             os: ubuntu-latest
             ninja_platform: linux
             qt_platform: linux
+            qt_arch: gcc_64
             openssl_arch: linux-x86_64
-            cmake_flags: "-DGENERATE_APPDATA=ON"
+            ld_library_arch: linux-x86-64
+            cmake_flags: "-DGENERATE_APPDATA=ON -DCMAKE_INSTALL_PREFIX=/usr -DUSE_SYSTEM_QT=ON -DENABLE_UPDATE_OVER_GUI=OFF"
+            pack: 0
             cmake_env: {}
 
           - name: macos
@@ -150,23 +169,6 @@ jobs:
               CXX: clang++
             pack: 1
 
-          - name: win32
-            os: windows-latest
-            ninja_platform: win
-            qt_platform: windows
-            qt_arch: win32_msvc2019
-            qt_arch_check_only: win32_msvc2017
-            openssl_arch: VC-WIN32
-            msvc_arch: x86
-            cmake_flags: "-DUSE_BUNDLED_ZLIB=1"
-            cmake_env:
-              CMAKE_RC_FLAGS: "/C 1252"
-              CC: clang
-              CXX: clang++
-              CMAKE_C_FLAGS: -m32
-              CMAKE_CXX_FLAGS: -m32
-            pack: 1
-
     steps:
       # otherwise the testcases will fail, because signature is invalid
       - name: Set git name and email
@@ -193,9 +195,8 @@ jobs:
           perl-version: '5.30'
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2.13.0
+        uses: jurplel/install-qt-action@v3.3.0
         timeout-minutes: 10
-        if: "!matrix.qt.check_only"
         with:
           version: ${{ matrix.qt.version }}
           target: desktop
@@ -204,18 +205,6 @@ jobs:
           install-deps: true
           modules: qtwebengine
 
-      - name: Install Qt
-        uses: jurplel/[email protected]
-        timeout-minutes: 10
-        if: matrix.qt.check_only
-        with:
-          version: ${{ matrix.qt.version }}
-          target: desktop
-          host: ${{ matrix.env.qt_platform }}
-          arch: ${{ matrix.env.qt_arch_check_only }}
-          install-deps: true
-          modules: qtwebengine
-
       - name: Install Ninja
         uses: seanmiddleditch/gha-setup-ninja@v3
         with:
@@ -245,10 +234,6 @@ jobs:
         run: |
           cd dep/openssl/openssl
 
-          # this is necessary until https://github.com/openssl/openssl/issues/18720
-          # is fixed in OpenSSL 1.1.1r
-          export CFLAGS=-Wno-error=implicit-function-declaration
-
           ./Configure ${{ matrix.env.openssl_arch }} no-shared
           make
 
@@ -264,7 +249,7 @@ jobs:
         run: |
           mkdir -p build/release
           cd build/release
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDEBUG_OUTPUT=OFF -DGITTYUP_CI_TESTS=ON ${{ env.CMAKE_FLAGS }} ${{ matrix.env.cmake_flags }} ../..
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DUPDATE_TRANSLATIONS=ON -DGITTYUP_CI_TESTS=ON ${{ env.CMAKE_FLAGS }} ${{ matrix.env.cmake_flags }} ../..
 
       - name: Build Information
         run: |
@@ -280,7 +265,7 @@ jobs:
 
       # Command copied from flathub build process
       - name: Validate appdata file
-        if: matrix.env.ninja_platform == 'linux' && !matrix.qt.check_only
+        if: matrix.env.ninja_platform == 'linux'
         run: |
           echo "Show generated appdata file"
           cat ./build/release/rsrc/linux/com.github.Murmele.Gittyup.appdata.xml
@@ -291,32 +276,81 @@ jobs:
           flatpak run --env=G_DEBUG=fatal-criticals org.freedesktop.appstream-glib validate ./build/release/rsrc/linux/com.github.Murmele.Gittyup.appdata.xml
 
       - name: Publish build artifacts
-        if: matrix.env.pack && !matrix.qt.check_only
+        if: matrix.env.pack
         uses: actions/upload-artifact@v3
         with:
           path: build/release/pack/Gittyup-*
           name: Gittyup ${{ matrix.env.name }}
 
       - name: Publish version file
-        if: matrix.env.pack && !matrix.qt.check_only
+        if: matrix.env.pack
         uses: actions/upload-artifact@v3
         with:
-          path: build/release/VERSION.txt
+          path: build/release/Version.txt
           name: Gittyup-VERSION
 
+      - name: Check Version file
+        run: |
+          cd build/release
+          cat ./Version.txt
+
       - name: Test
         if: matrix.env.ninja_platform != 'win' && matrix.env.ninja_platform != 'mac'
         uses: GabrielBB/xvfb-action@v1
         with:
           working-directory: build/release
-          run: ninja check
+          run: ninja check --verbose
 
       - name: Test (Windows)
         if: matrix.env.ninja_platform == 'win'
         run: |
           cd build/release
           ninja check_no_win32_offscreen
 
+      - name: Build Appimage
+        if: matrix.env.ninja_platform == 'linux'
+        run: |
+          cd build/release
+          sudo apt -y install appstream
+          sudo apt -y install libfuse2
+          sudo apt -y install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxcb-cursor0 libxkbcommon0 libx11-xcb1
+          sudo apt -y install libxcb-shm0 libxcb-sync1 libxcb-util1 libxcb-xinerama0 libxcb-xinput0 libxcb-xkb1 libxcb-xrm0 libxcb-xv0 libxcb-xvmc0 libxcb1
+
+          mkdir -p AppDir
+          DESTDIR=AppDir ninja install
+
+          export QTDIR=$RUNNER_WORKSPACE/Qt/${{ matrix.qt.version }}/${{ matrix.env.qt_arch }}
+
+          rm -rf ./AppDir/usr/include/
+          strip ./AppDir/usr/bin/cmark ./AppDir/usr/bin/gittyup ./AppDir/usr/bin/indexer ./AppDir/usr/bin/relauncher
+
+          wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
+          chmod +x appimagetool-*.AppImage
+          echo Show QTDIR
+          ls $QTDIR
+          echo Show QTDIR plugins
+          ls $QTDIR/plugins
+          echo Show QTDIR plugins platforms
+          ls $QTDIR/plugins/platforms
+          QTDIR=$QTDIR ./appimagetool-*.AppImage -s deploy ./AppDir/usr/share/applications/*.desktop --appimage-extract-and-run # Bundle EVERYTHING
+
+          # Modify the AppDir: move ld-linux into the same directory as the payload application
+          # and change AppRun accordingly; so that, e.g., Qt qApp->applicationDirPath() works
+          mv ./AppDir/lib64/ld-${{ matrix.env.ld_library_arch }}.so.2 ./AppDir/usr/bin/
+          sed -i -e 's@^LD_LINUX.*@LD_LINUX=$(find "$HERE/usr/bin" -name "ld-*.so.*" | head -n 1)@g' ./AppDir/AppRun
+
+          rm ./AppDir/usr/share/metainfo/gittyup.appdata.xml
+          VERSION=$(cat ./Version.txt)
+          VERSION="$VERSION" ./appimagetool-*.AppImage ./AppDir # turn AppDir into AppImage
+          #ls -lh Gittyup-*
+
+      - name: Publish Appimage
+        if: matrix.env.ninja_platform == 'linux'
+        uses: actions/upload-artifact@v3
+        with:
+          path: build/release/*.AppImage
+          name: GittyupAppImage
+
   publish:
     # https://github.com/marvinpinto/actions/issues/177
     needs: [flatpak, build]
@@ -347,7 +381,7 @@ jobs:
       # version is exported from cmake to file
       - name: Retrieve version
         run: |
-          echo "::set-output name=VERSION::$(cat artifacts/Gittyup-VERSION/VERSION.txt)"
+          echo "::set-output name=VERSION::$(cat artifacts/Gittyup-VERSION/Version.txt)"
         id: version
 
       - name: Update GitHub release (latest tag)
@@ -359,10 +393,10 @@ jobs:
           automatic_release_tag: 'development'
           files: |
             **/artifacts/Gittyup win64/Gittyup*.exe
-            **/artifacts/Gittyup win32/Gittyup*.exe
             **/artifacts/Gittyup macos/Gittyup*.dmg
             **/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
             **/Gittyup-x86_64/*.flatpak
+            **/artifacts/GittyupAppImage/*
 
       - name: Update GitHub release (version tag)
         uses: marvinpinto/action-automatic-releases@latest
@@ -374,10 +408,10 @@ jobs:
           automatic_release_tag: ${{ github.ref_name }}
           files: |
             **/artifacts/Gittyup win64/Gittyup*.exe
-            **/artifacts/Gittyup win32/Gittyup*.exe
             **/artifacts/Gittyup macos/Gittyup*.dmg
             **/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
             **/Gittyup-x86_64/*.flatpak
+            **/artifacts/GittyupAppImage/*
 
       # needed otherwise the docs folder is not available     
       - name: Checkout repository

.gitignore

@@ -1,5 +1,13 @@
 build
+.cache
 .DS_Store
 .project
 .vscode/
 CMakeLists.txt.user
+cmake-build-debug/
+cmake-build-release/
+build
+.idea/
+.venv
+compile_commands.json
+

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+- repo: https://github.com/pre-commit/mirrors-clang-format
+  rev: v13.0.1
+  hooks:
+  - id: clang-format
+    args: [ -i ]
+