Work on CI builds

emericg · Sep 30, 2023 · e9ef4b8 · e9ef4b8
1 parent ad969e9
commit e9ef4b8
Show file tree

Hide file tree

Showing 7 changed files with 151 additions and 166 deletions.
diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml
@@ -15,7 +15,7 @@ on:
 env:
   APP_NAME: "WatchFlower"
   APP_VERSION: "5.3"
-  QT_VERSION: "6.5.2"
+  QT_VERSION: "6.5.3"
 
 #-------------------------------------------------------------------------------
 # Workflow jobs
@@ -27,9 +27,9 @@ jobs:
     name: "Linux CI build"
     runs-on: ubuntu-20.04
     steps:
-      # Checkout the repository
-      - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+      # Checkout the repository (and submodules)
+      - name: Checkout repository (and submodules)
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -61,28 +61,35 @@ jobs:
       - name: Deploy application
         run: ./deploy_linux.sh -c -i -p
 
+      # Upload archive
+      - name: Upload archive
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.tar.gz
+          path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.tar.gz
+
       # Upload AppImage
       - name: Upload AppImage
         uses: actions/upload-artifact@v3
         with:
           name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.AppImage
-          path: ${{env.APP_NAME}}*.AppImage
+          path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.AppImage
 
   ## macOS build ###############################################################
   build-mac:
     name: "macOS CI build"
     runs-on: macos-12
     steps:
-      # Checkout the repository
-      - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+      # Checkout the repository (and submodules)
+      - name: Checkout repository (and submodules)
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      # Install dependencies
-      #- name: Install dependencies
+      # Install dependencies (from package manager)
+      #- name: Install dependencies (from package manager)
       #  run: |
-      #       brew install qt6
+      #       brew install qt6 cmake
 
       # Install Qt
       - name: Install Qt
@@ -107,21 +114,21 @@ jobs:
       - name: Deploy application
         run: ./deploy_macos.sh -c -p
 
-      # Upload app zip
-      - name: Upload app zip
+      # Upload app ZIP
+      - name: Upload app ZIP
         uses: actions/upload-artifact@v3
         with:
-          name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS
-          path: bin/${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
+          name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
+          path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
 
   ## Windows build #############################################################
   build-windows:
     name: "Windows CI build"
     runs-on: windows-2022
     steps:
-      # Checkout the repository
-      - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+      # Checkout the repository (and submodules)
+      - name: Checkout repository (and submodules)
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -161,16 +168,16 @@ jobs:
       - name: Deploy application
         run: sh deploy_windows.sh -c -p
 
-      # Upload ZIP
-      - name: Upload ZIP
+      # Upload app ZIP
+      - name: Upload app ZIP
         uses: actions/upload-artifact@v3
         with:
-          name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64
+          name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.zip
           path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.zip
 
       # Upload NSIS installer
       - name: Upload NSIS installer
         uses: actions/upload-artifact@v3
         with:
-          name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64
+          name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.exe
           path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.exe
diff --git a/.github/workflows/builds_mobile.yml b/.github/workflows/builds_mobile.yml
@@ -15,7 +15,7 @@ on:
 env:
   APP_NAME: "WatchFlower"
   APP_VERSION: "5.3"
-  QT_VERSION: "6.5.2"
+  QT_VERSION: "6.5.3"
 
 #-------------------------------------------------------------------------------
 # Workflow jobs
@@ -27,9 +27,9 @@ jobs:
     name: "Android CI build"
     runs-on: ubuntu-20.04
     steps:
-      # Checkout the repository
-      - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+      # Checkout the repository (and submodules)
+      - name: Checkout repository (and submodules)
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -45,7 +45,7 @@ jobs:
       #  uses: android-actions/setup-android@v2
       #- name: Install Android SDK / NDK / tools
       #  run: |
-      #       sdkmanager "platforms;android-32"
+      #       sdkmanager "platforms;android-33"
       #       sdkmanager "ndk;25.2.9519653"
       #       sdkmanager "build-tools;33.0.2"
 
@@ -76,11 +76,11 @@ jobs:
   ## iOS build #################################################################
   build-ios:
     name: "iOS CI build"
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
-      # Checkout the repository
-      - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+      # Checkout the repository (and submodules)
+      - name: Checkout repository (and submodules)
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -15,11 +15,11 @@ jobs:
     name: "Flatpak build"
     runs-on: ubuntu-20.04
     container:
-      image: bilelmoussaoui/flatpak-github-actions:freedesktop-22.08
+      image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08
       options: --privileged
     steps:
-    - uses: actions/checkout@v3
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+    - uses: actions/checkout@v4
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: watchflower.flatpak
         manifest-path: assets/linux/watchflower.flatpak.yml

diff --git a/assets/linux/watchflower.flatpak.yml b/assets/linux/watchflower.flatpak.yml
@@ -1,6 +1,6 @@
 app-id: io.emeric.watchflower
 runtime: org.freedesktop.Platform
-runtime-version: '22.08'
+runtime-version: '23.08'
 sdk: org.freedesktop.Sdk
 command: watchflower
 
@@ -38,49 +38,6 @@ cleanup:
   - '*.la'
 
 modules:
-  - name: libical # required by bluez
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      - -DBUILD_SHARED_LIBS:BOOL=ON
-      - -DICAL_GLIB=true
-      - -DGOBJECT_INTROSPECTION=true
-      - -DICAL_GLIB_VAPI=true
-      - -DICAL_BUILD_DOCS=false
-      - -DICAL_GLIB_VAPI=false
-    sources:
-      - type: archive
-        url: https://github.com/libical/libical/archive/v3.0.16.tar.gz
-        sha256: b44705dd71ca4538c86fb16248483ab4b48978524fb1da5097bd76aa2e0f0c33
-        x-checker-data:
-          type: anitya
-          project-id: 1637
-          url-template: https://github.com/libical/libical/archive/v$version.tar.gz
-
-  - name: bluez # required by qtconnectivity
-    buildsystem: autotools
-    config-opts:
-      - --disable-tools
-      - --disable-cups
-      - --disable-monitor
-      - --disable-client
-      - --disable-systemd
-      - --disable-udev
-      - --disable-manpages
-      - --disable-datafiles
-      - --enable-experimental
-      - --enable-library
-      - --prefix=/app
-      - --sysconfdir=/app/etc
-    sources:
-      - type: archive
-        url: https://www.kernel.org/pub/linux/bluetooth/bluez-5.69.tar.xz
-        sha256: bc5a35ddc7c72d0d3999a0d7b2175c8b7d57ab670774f8b5b4900ff38a2627fc
-        x-checker-data:
-          type: anitya
-          project-id: 10029
-          url-template: https://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz
-
   - name: qt-base
     buildsystem: cmake-ninja
     builddir: true
@@ -90,8 +47,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz
-        sha256: 3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz
+        sha256: df2f4a230be4ea04f9798f2c19ab1413a3b8ec6a80bef359f50284235307b546
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -110,8 +67,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz
-        sha256: 551ffb22751d8fd4d88e9ebd55b9131f4ca55341ee497fdbbba4da8d10d94341
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qttools-everywhere-src-6.5.3.tar.xz
+        sha256: fc91d32b3f696725bbb48b0df240c25b606bbee3bd22627cfcbee876a6405e37
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -126,8 +83,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz
-        sha256: ca3fb0db8576c59b9c38bb4b271cc6e10aebeb54e2121f429f4ee80671fc0a3d
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qtshadertools-everywhere-src-6.5.3.tar.xz
+        sha256: 201b7b3a409f048e78c5defb90a70af423166313ad4386f8e6b83990ae0f3573
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -144,8 +101,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz
-        sha256: f3a11fe54e9fac77c649e46e39f1cbe161e9efe89bad205115ba2861b1eb8719
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qtdeclarative-everywhere-src-6.5.3.tar.xz
+        sha256: 404dd6d2d206bb882ecd6622f0c708c9d6bd724a4d83776e13c49761c159d215
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -160,8 +117,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz
-        sha256: 3020be86fb7fd0abb8509906ca6583cadcaee168159abceaeb5b3e9d42563c9a
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qtwayland-everywhere-src-6.5.3.tar.xz
+        sha256: f72a8588b7ff9b81bb311f2c8b541c11788b81003537b010360ca80eae52369f
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -178,8 +135,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz
-        sha256: aae0c08924c6a5e47f9d57e031673d611ffff7aab2bee2e1cc460471ecac6743
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qtimageformats-everywhere-src-6.5.3.tar.xz
+        sha256: 49c026c49a738ed024c072a4b205cdc1235507da4a2d0ea740bd574fff138ccb
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -194,8 +151,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz
-        sha256: 48b4cc1093af2e0ab3bea30f60651bddd877a2335d16e7207879a2e9e81963a3
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qtsvg-everywhere-src-6.5.3.tar.xz
+        sha256: fc41c47b69ca1f80473cd4b11996394155781105345392961d064d04f95d5bef
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -210,8 +167,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz
-        sha256: db2e4922352d253cafbb8f21eeca58da269c19e0e6d614420af19a7cd35fdc99
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qtconnectivity-everywhere-src-6.5.3.tar.xz
+        sha256: 242231b06071eff72c8b2a39e54bf813f7eed3ef53473d2eb711603634be3f5b
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -226,8 +183,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz
-        sha256: 775af7be019cca698b27e5acffbc2def8f7a5b8f06f5c6db2a7015d578a6ad2d
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qtcharts-everywhere-src-6.5.3.tar.xz
+        sha256: 4a9b800e0af5bfded97592aa5836cfd761bf4de1ada414a603951f021d752ed9
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -242,8 +199,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz
-        sha256: b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4
+        url: https://download.qt.io/archive/qt/6.5/6.5.3/submodules/qt5compat-everywhere-src-6.5.3.tar.xz
+        sha256: eeb2a9e27771e15aaa7935f61a8024b46cc8e2044ae0ceacff2754c0cb806464
         x-checker-data:
           type: anitya
           project-id: 7927