Merge branch 'devel' into mpris

sailfishos-applications · Dec 6, 2023 · 1299113 · 1299113
2 parents a2df367 + c936cca
commit 1299113
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 10 deletions.
diff --git a/.github/workflows/build-on-pull_req.yml b/.github/workflows/build-on-pull_req.yml
@@ -1,7 +1,7 @@
-name: CI on PRs with SDK for 2.2.0 (i486)
+name: CI on PRs with SDK for 3.0.2 (i486)
 
 env:
-  RELEASE: 2.2.0.29
+  RELEASE: 3.0.2.8
   ARCH: i486
   # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 3 minutes.
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
@@ -50,13 +50,14 @@ jobs:
     - name: Build ${{ env.ARCH }}
       uses: coderus/github-sfos-build@old-stable
       with:
-        # Solely builds for i486 on 2.2.0, because of https://github.com/sailfishos-patches/patchmanager/pull/437#issuecomment-1615317003
+        # Solely builds for i486 on 3.0.2, because of https://github.com/sailfishos-patches/patchmanager/pull/437#issuecomment-1615317003
+        # and https://github.com/sailfishos-applications/filecase/issues/45
         release: ${{ env.RELEASE }}
         arch: ${{ env.ARCH }}
 
     - name: Upload build result
       uses: actions/upload-artifact@v3
       with:
-        name: RPM-build-results_${{ github.base_ref }}-${{ env.ARCH }}-SFOS2.2.0+
+        name: RPM-build-results_${{ github.base_ref }}-${{ env.ARCH }}-SFOS${{ env.RELEASE }}+
         path: RPMS/
 
diff --git a/.github/workflows/build-on-tags.yml b/.github/workflows/build-on-tags.yml
@@ -66,11 +66,54 @@ jobs:
         path: RPMS/
 
 
-  SDK-310:
+  SDK-302:
     runs-on: ubuntu-22.04
     env:
       # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
-      RELEASE: 3.1.0.12
+      RELEASE: 3.0.2.8
+      # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    # Caching Docker images is not ready yet, see 
+    # https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
+    #- name: Cache Docker images of the Sailfish-SDK
+    #  id: cache-sdk
+    #  uses: actions/cache@v3
+    #  with:
+    #    path: $GITHUB_WORKSPACE/…
+    #    key: cache
+
+    - name: Prepare
+      run: mkdir RPMS
+
+    - name: Build armv7hl on ${{ env.RELEASE }}
+      uses: coderus/github-sfos-build@old-stable
+      with:
+        release: ${{ env.RELEASE }}
+        arch: armv7hl
+
+    - name: Build i486 on ${{ env.RELEASE }}
+      uses: coderus/github-sfos-build@old-stable
+      with:
+        release: ${{ env.RELEASE }}
+        arch: i486
+
+    - name: Upload build results
+      uses: actions/upload-artifact@v3
+      with:
+        name: RPM-build-results_SFOS${{ env.RELEASE }}+
+        path: RPMS/
+
+
+  SDK-320:
+    runs-on: ubuntu-22.04
+    env:
+      # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
+      RELEASE: 3.2.0.12
       # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     steps:
@@ -158,11 +201,11 @@ jobs:
         path: RPMS/
 
 
-  SDK-440:
+  SDK-430:
     runs-on: ubuntu-22.04
     env:
       # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
-      RELEASE: 4.4.0.68
+      RELEASE: 4.3.0.12
       # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     steps:

diff --git a/rpm/flowplayer.spec b/rpm/flowplayer.spec
@@ -10,7 +10,7 @@ Name:       flowplayer
 Summary:    Music Player for SailfishOS
 # The <version> tag must adhere to semantic versioning: Among multiple other
 # reasons due to its use for `qmake5` in line 56.  See https://semver.org/
-Version:    0.3.0
+Version:    0.3.1
 # The <release> tag comprises one of {alpha,beta,rc,release} postfixed with a
 # natural number greater or equal to 1 (e.g., "beta3") and may additionally be
 # postfixed with a plus character ("+"), the name of the packager and a release
@@ -21,7 +21,7 @@ Version:    0.3.0
 # build at GitHub and OBS, when configured accordingly; mind the sorting
 # (`adud` < `alpha`).  For details and reasons, see
 # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format
-Release:    rc1
+Release:    1
 # The Group tag should comprise one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group:      Applications/Multimedia