master→sfos4.2: Commits for v0.3.3 (#388)

* Update to recent version of that paragraph … (#372) … in Storeman Installer's README.md * Extend a comment and remove an installer log file (#373) * Enhance comment (#374) * Update harbour-storeman.spec (#375) * Enhance GitHub issue-templates (#376) * Update harbour-storeman.spec * Update bug-template.md * Update help-template.md * Update suggestion-template.md * Shorten CI run name (#377) * Shorten CI run name * Reorder and add RC * Update & overhaul (#378) * Overhaul & introduce caching * Overhaul, update & introduce caching * Overhaul, update & introduce caching * Overhaul, update & introduce caching * Overhaul, update & introduce caching * Create build-sfos4.2_latest.yml * Timeout: 1 → 2 [minutes] * Timeout: 3 → 2 [minutes] * Timeout: 1 → 2 [minutes] * Timeout: 1 → 2 [minutes] * Fix caching? * Disable caching stub * Disable caching stub * Omit empty line * Disable caching stub * Disable caching stub * Disable caching stub * Add `rpmlintrc` & alter homepage * Update CI workflow configurations (#380) * Update build-devel.yml * Update build-sfos4.2_latest.yml * Update build-sfos4.2.yml * Update build-sfos3.3.yml * Update build-sfos3.1.yml * Fix missed "s" * Shorten comment * Fix category name * Create harbour-storeman.rpmlintrc * Add stub for v0.3.3 * Fix * - "-1" * Re-add `Obsoletes: %{name}-installer` (#382) Re-add `Obsoletes Installer * Unify categories order (#383) * Add (dummy) changelog item (#385) * Fix CI for sfos-latest (#389) Fix? * Revert "Fix CI for sfos-latest" (#392) Revert "Fix CI for sfos-latest (#389)" This reverts commit 5b2780d. * Fix CI workflow for SFOS-latest (#393)
storeman-developers · Jan 28, 2023 · c860ab5 · c860ab5
2 parents 6b029f5 + 8a54237
commit c860ab5
Show file tree

Hide file tree

Showing 12 changed files with 280 additions and 147 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-template.md b/.github/ISSUE_TEMPLATE/bug-template.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Report a bug for this project
+about: Report a bug for Storeman
 title: "[Bug] "
 labels: 'bug'
 assignees: ''
@@ -9,7 +9,7 @@ assignees: ''
 
 **SailfishOS VERSION** (Settings → About product → Build): 
 <br />**HARDWARE** (Settings → About product → Manufacturer & Product name): 
-<br />**Storeman VERSION** (Storeman → [Top pulley] About Storeman): 
+<br />**Storeman VERSION** (Storeman → \<Top pulley\> → About Storeman): 
 <br />
 
 #### BUG DESCRIPTION
@@ -20,4 +20,4 @@ assignees: ''
 
 #### ADDITIONAL INFORMATION
 
-<Please consider which other pieces of information may be relevant: Denote if this is not always reproducible, if this is a regression (then name to which older version), attach relevant data such as log files or the systemd journal, provide screenshots etc.>
+<sub>\[Please consider which other pieces of information may be relevant: Denote if this is not always reproducible, if this is a regression (then name to which older version), attach relevant data such as log files or the systemd journal, provide screenshots etc.\]</sub>
diff --git a/.github/ISSUE_TEMPLATE/help-template.md b/.github/ISSUE_TEMPLATE/help-template.md
@@ -1,6 +1,6 @@
 ---
 name: Help form
-about: Questions about this project
+about: Questions about Storeman
 title: "[Help] "
 labels: 'question'
 assignees: ''
@@ -9,7 +9,7 @@ assignees: ''
 
 **SailfishOS VERSION** (Settings → About product → Build): 
 <br />**HARDWARE** (Settings → About product → Manufacturer & Product name): 
-<br />**Storeman VERSION** (Storeman → [Top pulley] About Storeman): 
+<br />**Storeman VERSION** (Storeman → \<Top pulley\> → About Storeman): 
 <br />
 
 #### QUESTION
@@ -20,4 +20,4 @@ assignees: ''
 
 #### ADDITIONAL INFORMATION
 
-<Please consider which other pieces of information may be relevant: Denote if this is not always reproducible, if this is a regression (then name to which older version), attach relevant data such as log files or the systemd journal, provide screenshots etc.>
+<sub>\[Please consider which other pieces of information may be relevant: Denote if this is not always reproducible, if this is a regression (then name to which older version), attach relevant data such as log files or the systemd journal, provide screenshots etc.\]</sub>
diff --git a/.github/ISSUE_TEMPLATE/suggestion-template.md b/.github/ISSUE_TEMPLATE/suggestion-template.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest an idea for Storeman
 title: "[Suggestion] "
 labels: 'feature request'
 assignees: ''
@@ -12,4 +12,4 @@ assignees: ''
 
 #### ADDITIONAL INFORMATION
 
-<Please consider which other pieces of information may be relevant: Attach relevant data, provide screenshots etc.>
+<sub>\[Please consider which other pieces of information may be relevant: Attach relevant data, provide screenshots etc.\]</sub>
diff --git a/.github/workflows/build-devel.yml b/.github/workflows/build-devel.yml
@@ -1,7 +1,7 @@
-name: CI build - devel branch for SFOS 3.3.0.14 (armv7hl)
+name: CI - devel branch on SFOS 3.3.0 (armv7hl)
 
 env:
-  sfos_target: 3.3.0.14
+  RELEASE: 3.3.0.14
 
 on:
   pull_request:
@@ -10,22 +10,34 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
-
+    runs-on: ubuntu-22.04
+    env:
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
     steps:
-    - uses: actions/checkout@v2
+    - 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
       uses: coderus/github-sfos-build@old-stable
       with:
-        release: ${{ env.sfos_target }}
+        release: ${{ env.RELEASE }}
         arch: armv7hl
 
     - name: Upload build result
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
-        name: rpm-build-result
-        path: RPMS
+        name: RPM-build-results
+        path: RPMS/
+
diff --git a/.github/workflows/build-sfos3.1.yml b/.github/workflows/build-sfos3.1.yml
@@ -1,14 +1,15 @@
-name: CI build - sfos3.2 branch for SFOS 3.1.0.12 (armv7hl, i486)
+name: CI - sfos3.2 branch on SFOS 3.1.0 (armv7hl,i486)
 
 env:
-  sfos_target: 3.1.0.12
+  RELEASE: 3.1.0.12
 
 on:
   push:
     tags:
       - 'sfos3.2_release/*'
-      - 'sfos3.2_alpha/*'
+      - 'sfos3.2_rc/*'
       - 'sfos3.2_beta/*'
+      - 'sfos3.2_alpha/*'
       - 'sfos3.2_test/*'
       - 'sfos3.2/*'
   pull_request:
@@ -17,28 +18,39 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
-
+    runs-on: ubuntu-22.04
+    env:
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     steps:
-    - uses: actions/checkout@v2
+    - 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
+    - name: Build armv7hl on ${{ env.RELEASE }}
       uses: coderus/github-sfos-build@old-stable
       with:
-        release: ${{ env.sfos_target }}
+        release: ${{ env.RELEASE }}
         arch: armv7hl
 
-    - name: Build i486
+    - name: Build i486 on ${{ env.RELEASE }}
       uses: coderus/github-sfos-build@old-stable
       with:
-        release: ${{ env.sfos_target }}
+        release: ${{ env.RELEASE }}
         arch: i486
 
-    - name: Upload build result
-      uses: actions/upload-artifact@v2
+    - name: Upload build results
+      uses: actions/upload-artifact@v3
       with:
-        name: rpm-build-result
-        path: RPMS
+        name: RPM-build-results
+        path: RPMS/
diff --git a/.github/workflows/build-sfos3.3.yml b/.github/workflows/build-sfos3.3.yml
@@ -1,15 +1,16 @@
-name: CI build - sfos3.3 branch for SFOS 3.3.0.14 (armv7hl, i486) & SFOS 4.0.1.45 (aarch64)
+name: CI - sfos3.3 branch on SFOS 3.3.0 (armv7hl,i486) & SFOS 4.0.1 (aarch64)
 
 
 env:
-  sfos_target: 3.3.0.14
+  RELEASE: 3.3.0.14
 
 on:
   push:
     tags:
       - 'sfos3.3_release/*'
-      - 'sfos3.3_alpha/*'
+      - 'sfos3.3_rc/*'
       - 'sfos3.3_beta/*'
+      - 'sfos3.3_alpha/*'
       - 'sfos3.3_test/*'
       - 'sfos3.3/*'
   pull_request:
@@ -18,34 +19,45 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
-
+    runs-on: ubuntu-22.04
+    env:
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     steps:
-    - uses: actions/checkout@v2
+    - 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
+    - name: Build aarch64 on 4.0.1.45
       uses: coderus/github-sfos-build@old-stable
       with:
-        release: ${{ env.sfos_target }}
-        arch: armv7hl
+        release: 4.0.1.45
+        arch: aarch64
 
-    - name: Build i486
+    - name: Build armv7hl on ${{ env.RELEASE }}
       uses: coderus/github-sfos-build@old-stable
       with:
-        release: ${{ env.sfos_target }}
-        arch: i486
-    
-    - name: Build aarch64
+        release: ${{ env.RELEASE }}
+        arch: armv7hl
+
+    - name: Build i486 on ${{ env.RELEASE }}
       uses: coderus/github-sfos-build@old-stable
       with:
-        release: 4.0.1.45
-        arch: aarch64
+        release: ${{ env.RELEASE }}
+        arch: i486
 
-    - name: Upload build result
-      uses: actions/upload-artifact@v2
+    - name: Upload build results
+      uses: actions/upload-artifact@v3
       with:
-        name: rpm-build-result
-        path: RPMS
+        name: RPM-build-results
+        path: RPMS/
diff --git a/.github/workflows/build-sfos4.2.yml b/.github/workflows/build-sfos4.2.yml
@@ -1,14 +1,15 @@
-name: CI build - sfos4.2 branch for SFOS 4.2.0.21 (aarch64, armv7hl, i486)
+name: CI - sfos4.2 branch on SFOS 4.2.0 (aarch64,armv7hl,i486)
 
 env:
-  sfos_target: 4.2.0.21
+  RELEASE: 4.2.0.21
 
 on:
   push:
     tags:
       - 'sfos4.2_release/*'
-      - 'sfos4.2_alpha/*'
+      - 'sfos4.2_rc/*'
       - 'sfos4.2_beta/*'
+      - 'sfos4.2_alpha/*'
       - 'sfos4.2_test/*'
       - 'sfos4.2/*'
   pull_request:
@@ -17,34 +18,45 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
-
+    runs-on: ubuntu-22.04
+    env:
+      SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     steps:
-    - uses: actions/checkout@v2
+    - 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
+    - name: Build aarch64 on ${{ env.RELEASE }}
       uses: coderus/github-sfos-build@master
       with:
-        release: ${{ env.sfos_target }}
-        arch: armv7hl
+        release: ${{ env.RELEASE }}
+        arch: aarch64
 
-    - name: Build i486
+    - name: Build armv7hl on ${{ env.RELEASE }}
       uses: coderus/github-sfos-build@master
       with:
-        release: ${{ env.sfos_target }}
-        arch: i486
+        release: ${{ env.RELEASE }}
+        arch: armv7hl
 
-    - name: Build aarch64
+    - name: Build i486 on ${{ env.RELEASE }}
       uses: coderus/github-sfos-build@master
       with:
-        release: ${{ env.sfos_target }}
-        arch: aarch64
+        release: ${{ env.RELEASE }}
+        arch: i486
 
-    - name: Upload build result
-      uses: actions/upload-artifact@v2
+    - name: Upload build results
+      uses: actions/upload-artifact@v3
       with:
-        name: rpm-build-result
-        path: RPMS
+        name: RPM-build-results
+        path: RPMS/