Skip to content

Commit

Permalink
mastersfos3.1: First round of commits for v0.3.8 (#458)
Browse files Browse the repository at this point in the history
* [harbour-storeman.spec] Post release version increase

* [harbour-storeman.changes] Add stub for v0.3.8

* Rename branch `sfos3.2`→`sfos3.1` & name `RPM.zip` (#454)

* [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

* [harbour-storeman.changes] Record intitial change

* [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
  • Loading branch information
Olf0 committed Sep 12, 2023
2 parents 1071a75 + 411242d commit 0f78dcd
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 13 deletions.
24 changes: 23 additions & 1 deletion .github/workflows/build-devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,12 +47,19 @@ 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

- 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/

# 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'

36 changes: 28 additions & 8 deletions .github/workflows/build-sfos3.1.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,37 @@
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

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

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
Expand Down Expand Up @@ -51,5 +64,12 @@ 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/

# 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'

22 changes: 21 additions & 1 deletion .github/workflows/build-sfos3.3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -57,5 +70,12 @@ 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/

# 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'

22 changes: 21 additions & 1 deletion .github/workflows/build-sfos4.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -57,5 +70,12 @@ jobs:
- name: Upload build results
uses: actions/upload-artifact@v3
with:
name: RPM-build-results
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'

22 changes: 21 additions & 1 deletion .github/workflows/build-sfos4.2_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -58,5 +71,12 @@ jobs:
- name: Upload build results
uses: actions/upload-artifact@v3
with:
name: RPM-build-results
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'

4 changes: 4 additions & 0 deletions rpm/harbour-storeman.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* Mon Sep 18 2023 olf <Olf0@users.noreply.github.com> - 0.3.8
- Rename branch sfos3.2 to sfos3.1 to reflect reality and avoid confusion (#454, #455)
-

* Mon Sep 11 2023 olf <Olf0@users.noreply.github.com> - 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)
Expand Down
2 changes: 1 addition & 1 deletion rpm/harbour-storeman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Name: harbour-storeman
Summary: OpenRepos client application for SailfishOS
# The <version> 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 <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
Expand Down

0 comments on commit 0f78dcd

Please sign in to comment.