From 39929b06535b153a7eab963290ea177ebd32926f Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 11 Sep 2023 21:17:00 +0200 Subject: [PATCH 1/5] [harbour-storeman.spec] Post release version increase --- rpm/harbour-storeman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index bcf80e1d..8ea265be 100644 --- a/rpm/harbour-storeman.spec +++ b/rpm/harbour-storeman.spec @@ -3,7 +3,7 @@ Name: harbour-storeman Summary: OpenRepos client application for SailfishOS # The tag must adhere to semantic versioning: Among multiple other # reasons due to its use for `qmake5` in line 107. See https://semver.org/ -Version: 0.3.7 +Version: 0.3.8 # The 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 From 26f11ad5616af3a4252c34c7de5610c4f47596a6 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 11 Sep 2023 21:21:22 +0200 Subject: [PATCH 2/5] [harbour-storeman.changes] Add stub for v0.3.8 --- rpm/harbour-storeman.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index 09e3fd6c..f5475ae4 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,3 +1,6 @@ +* Mon Sep 18 2023 olf - 0.3.8 +- + * Mon Sep 11 2023 olf - 0.3.7 - [harbour-storeman.ts] PRs #428 & #429 missed to adapt the base .ts file (#442) - Update some language specific .ts files according to PR #442 (4de442b, b129474, 7004990, b001953, 14c8f85, c390d44) From 2e1d2954e9e869a34bba1bc9984b96bb05ad500e Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 11 Sep 2023 22:59:10 +0200 Subject: [PATCH 3/5] =?UTF-8?q?Rename=20branch=20`sfos3.2`=E2=86=92`sfos3.?= =?UTF-8?q?1`=20&=20name=20`RPM.zip`=20(#454)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [build-sfos3.1.yml] `sfos3.2`→`sfos3.1` & name `RPM.zip` * [build-devel.yml] Name `RPM.zip` * [build-sfos3.1.yml] Enhance name of `RPM.zip` * [build-devel.yml] Enhance name of `RPM.zip` * [build-sfos3.3.yml] Enhance name of `RPM.zip` * [build-sfos4.2.yml] Enhance name of `RPM.zip` * [build-sfos4.2_latest.yml] Enhance name of `RPM.zip` * [build-devel.yml] Omit second trailing newline * [build-sfos3.1.yml] Add trailing newline * [build-devel.yml] Add trailing newline * [build-sfos3.3.yml] Add trailing newline * [build-sfos4.2.yml] Add trailing newline * [build-sfos4.2_latest.yml] Add trailing newline --- .github/workflows/build-devel.yml | 2 +- .github/workflows/build-sfos3.1.yml | 17 +++++++++-------- .github/workflows/build-sfos3.3.yml | 3 ++- .github/workflows/build-sfos4.2.yml | 3 ++- .github/workflows/build-sfos4.2_latest.yml | 3 ++- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-devel.yml b/.github/workflows/build-devel.yml index 097d8de2..4712887c 100644 --- a/.github/workflows/build-devel.yml +++ b/.github/workflows/build-devel.yml @@ -38,6 +38,6 @@ jobs: - name: Upload build result uses: actions/upload-artifact@v3 with: - name: RPM-build-results + name: RPM-build-results_devel-i486-sfos3.3.0+ path: RPMS/ diff --git a/.github/workflows/build-sfos3.1.yml b/.github/workflows/build-sfos3.1.yml index f510c808..352b3ff1 100644 --- a/.github/workflows/build-sfos3.1.yml +++ b/.github/workflows/build-sfos3.1.yml @@ -1,4 +1,4 @@ -name: CI - sfos3.2 branch on SFOS 3.1.0 (armv7hl,i486) +name: CI - sfos3.1 branch on SFOS 3.1.0 (armv7hl,i486) env: RELEASE: 3.1.0.12 @@ -6,14 +6,14 @@ env: on: push: tags: - - 'release*_sfos3.2/*' - - 'rc*_sfos3.2/*' - - 'beta*_sfos3.2/*' - - 'alpha*_sfos3.2/*' - - 'sfos3.2/*' + - 'release*_sfos3.1/*' + - 'rc*_sfos3.1/*' + - 'beta*_sfos3.1/*' + - 'alpha*_sfos3.1/*' + - 'sfos3.1/*' pull_request: branches: - - sfos3.2 + - sfos3.1 jobs: build: @@ -51,5 +51,6 @@ jobs: - name: Upload build results uses: actions/upload-artifact@v3 with: - name: RPM-build-results + name: RPM-build-results_sfos3.1.0-3.2.1 path: RPMS/ + diff --git a/.github/workflows/build-sfos3.3.yml b/.github/workflows/build-sfos3.3.yml index 74a22fb5..26f54d43 100644 --- a/.github/workflows/build-sfos3.3.yml +++ b/.github/workflows/build-sfos3.3.yml @@ -57,5 +57,6 @@ jobs: - name: Upload build results uses: actions/upload-artifact@v3 with: - name: RPM-build-results + name: RPM-build-results_sfos3.3.0-4.1.0 path: RPMS/ + diff --git a/.github/workflows/build-sfos4.2.yml b/.github/workflows/build-sfos4.2.yml index 21b3bbc1..d48004d3 100644 --- a/.github/workflows/build-sfos4.2.yml +++ b/.github/workflows/build-sfos4.2.yml @@ -57,5 +57,6 @@ jobs: - name: Upload build results uses: actions/upload-artifact@v3 with: - name: RPM-build-results + name: RPM-build-results_sfos4.2.0+ path: RPMS/ + diff --git a/.github/workflows/build-sfos4.2_latest.yml b/.github/workflows/build-sfos4.2_latest.yml index f41fa4dd..9c8e7bc8 100644 --- a/.github/workflows/build-sfos4.2_latest.yml +++ b/.github/workflows/build-sfos4.2_latest.yml @@ -58,5 +58,6 @@ jobs: - name: Upload build results uses: actions/upload-artifact@v3 with: - name: RPM-build-results + name: RPM-build-results_sfos-latest path: RPMS/ + From 229c404f24825bd768806db7c63d2990f7ea3b87 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 12 Sep 2023 00:08:33 +0200 Subject: [PATCH 4/5] [harbour-storeman.changes] Record intitial change --- rpm/harbour-storeman.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index f5475ae4..32fc915f 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,4 +1,5 @@ * Mon Sep 18 2023 olf - 0.3.8 +- Rename branch sfos3.2 to sfos3.1 to reflect reality and avoid confusion (#454, #455) - * Mon Sep 11 2023 olf - 0.3.7 From 4ff78ade74099ba157b3916645bdbfffc35884d1 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 12 Sep 2023 02:01:19 +0200 Subject: [PATCH 5/5] [Workflows] Add recent changes from Patchmanager (#457) * [build-devel.yml] Add recent changes from Patchmanager * [build-devel.yml] More stuff from Patchmanager * Update build-devel.yml] Revise one change * [build-devel.yml] Correct run-time * [build-sfos3.1.yml] Add recent changes from Patchmanager * [build-devel.yml] Add full stops in comments * [build-sfos3.1.yml] Add full stop in comment * [build-sfos3.3.yml] Add recent changes from Patchmanager * [build-sfos4.2.yml] Add recent changes from Patchmanager * [build-sfos4.2_latest.yml] Add recent changes from Patchmanager --- .github/workflows/build-devel.yml | 22 ++++++++++++++++++++++ .github/workflows/build-sfos3.1.yml | 19 +++++++++++++++++++ .github/workflows/build-sfos3.3.yml | 19 +++++++++++++++++++ .github/workflows/build-sfos4.2.yml | 19 +++++++++++++++++++ .github/workflows/build-sfos4.2_latest.yml | 19 +++++++++++++++++++ 5 files changed, 98 insertions(+) diff --git a/.github/workflows/build-devel.yml b/.github/workflows/build-devel.yml index 4712887c..05d2a27b 100644 --- a/.github/workflows/build-devel.yml +++ b/.github/workflows/build-devel.yml @@ -7,11 +7,26 @@ on: pull_request: branches: - devel + # Allows to run this workflow manually from the Actions tab. + workflow_dispatch: + +defaults: + run: + # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', + # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell + shell: sh + +# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow +concurrency: + group: ci-${{ github.ref_name }} + # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple. + cancel-in-progress: false jobs: build: runs-on: ubuntu-22.04 env: + # 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 steps: - name: Checkout @@ -32,6 +47,7 @@ jobs: - name: Build i486 uses: coderus/github-sfos-build@old-stable with: + # Solely builds for i486 on 3.3.0, because of https://github.com/sailfishos-patches/patchmanager/pull/437#issuecomment-1615317003 release: ${{ env.RELEASE }} arch: i486 @@ -41,3 +57,9 @@ jobs: name: RPM-build-results_devel-i486-sfos3.3.0+ path: RPMS/ +# Just for fun, see https://feathericons.com/ and +# https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#branding +#branding: # "Invalid workflow file: Unexpected value 'branding'"; maybe action MUST be located in '/' or the name MUST be action.yml or both, see e.g., https://github.com/actions/cache/blob/main/action.yml#L37 +# icon: 'gift' +# color: 'purple' + diff --git a/.github/workflows/build-sfos3.1.yml b/.github/workflows/build-sfos3.1.yml index 352b3ff1..e2e095ee 100644 --- a/.github/workflows/build-sfos3.1.yml +++ b/.github/workflows/build-sfos3.1.yml @@ -15,10 +15,23 @@ on: branches: - sfos3.1 +defaults: + run: + # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', + # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell + shell: sh + +# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow +concurrency: + group: ci-${{ github.ref_name }} + # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple. + cancel-in-progress: false + jobs: build: runs-on: ubuntu-22.04 env: + # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 5 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 steps: - name: Checkout @@ -54,3 +67,9 @@ jobs: name: RPM-build-results_sfos3.1.0-3.2.1 path: RPMS/ +# Just for fun, see https://feathericons.com/ and +# https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#branding +#branding: # "Invalid workflow file: Unexpected value 'branding'"; maybe action MUST be located in '/' or the name MUST be action.yml or both, see e.g., https://github.com/actions/cache/blob/main/action.yml#L37 +# icon: 'gift' +# color: 'purple' + diff --git a/.github/workflows/build-sfos3.3.yml b/.github/workflows/build-sfos3.3.yml index 26f54d43..bbfca767 100644 --- a/.github/workflows/build-sfos3.3.yml +++ b/.github/workflows/build-sfos3.3.yml @@ -15,10 +15,23 @@ on: branches: - sfos3.3 +defaults: + run: + # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', + # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell + shell: sh + +# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow +concurrency: + group: ci-${{ github.ref_name }} + # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple. + cancel-in-progress: false + jobs: build: runs-on: ubuntu-22.04 env: + # 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 @@ -60,3 +73,9 @@ jobs: name: RPM-build-results_sfos3.3.0-4.1.0 path: RPMS/ +# Just for fun, see https://feathericons.com/ and +# https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#branding +#branding: # "Invalid workflow file: Unexpected value 'branding'"; maybe action MUST be located in '/' or the name MUST be action.yml or both, see e.g., https://github.com/actions/cache/blob/main/action.yml#L37 +# icon: 'gift' +# color: 'purple' + diff --git a/.github/workflows/build-sfos4.2.yml b/.github/workflows/build-sfos4.2.yml index d48004d3..7bef6fec 100644 --- a/.github/workflows/build-sfos4.2.yml +++ b/.github/workflows/build-sfos4.2.yml @@ -15,10 +15,23 @@ on: branches: - sfos4.2 +defaults: + run: + # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', + # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell + shell: sh + +# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow +concurrency: + group: ci-${{ github.ref_name }} + # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple. + cancel-in-progress: false + jobs: build: runs-on: ubuntu-22.04 env: + # 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 @@ -60,3 +73,9 @@ jobs: name: RPM-build-results_sfos4.2.0+ path: RPMS/ +# Just for fun, see https://feathericons.com/ and +# https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#branding +#branding: # "Invalid workflow file: Unexpected value 'branding'"; maybe action MUST be located in '/' or the name MUST be action.yml or both, see e.g., https://github.com/actions/cache/blob/main/action.yml#L37 +# icon: 'gift' +# color: 'purple' + diff --git a/.github/workflows/build-sfos4.2_latest.yml b/.github/workflows/build-sfos4.2_latest.yml index 9c8e7bc8..a757d14f 100644 --- a/.github/workflows/build-sfos4.2_latest.yml +++ b/.github/workflows/build-sfos4.2_latest.yml @@ -16,10 +16,23 @@ on: branches: - sfos4.2 +defaults: + run: + # Note thas 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh', + # see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell + shell: sh + +# See, e.g.: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow +concurrency: + group: ci-${{ github.ref_name }} + # 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple. + cancel-in-progress: false + jobs: build: runs-on: ubuntu-22.04 env: + # 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 @@ -61,3 +74,9 @@ jobs: name: RPM-build-results_sfos-latest path: RPMS/ +# Just for fun, see https://feathericons.com/ and +# https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#branding +#branding: # "Invalid workflow file: Unexpected value 'branding'"; maybe action MUST be located in '/' or the name MUST be action.yml or both, see e.g., https://github.com/actions/cache/blob/main/action.yml#L37 +# icon: 'gift' +# color: 'purple' +