Skip to content

Commit 38a8e3f

Browse files
authored
mastersfos3.1: Commits for v0.7.3 (#541)
2 parents 87ab952 + 686d17e commit 38a8e3f

34 files changed

+467
-425
lines changed

.github/workflows/build-devel.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ defaults:
2525

2626
jobs:
2727
build:
28-
runs-on: ubuntu-22.04
28+
runs-on: ubuntu-24.04
2929
env:
3030
# Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 3 minutes.
3131
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
3232
steps:
3333

3434
- name: Checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
# Caching Docker images is not ready yet, see
3838
# https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
@@ -54,7 +54,7 @@ jobs:
5454
arch: i486
5555

5656
- name: Upload build result
57-
uses: actions/upload-artifact@v3
57+
uses: actions/upload-artifact@v4
5858
with:
5959
name: RPM-build-results_devel-i486-SFOS3.3.0+
6060
path: RPMS/

.github/workflows/build-sfos3.1.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ concurrency:
3232

3333
jobs:
3434
build:
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
env:
3737
# Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 5 minutes.
3838
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
3939
steps:
4040

4141
- name: Checkout
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343

4444
# Caching Docker images is not ready yet, see
4545
# https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
@@ -66,7 +66,7 @@ jobs:
6666
arch: i486
6767

6868
- name: Upload build results
69-
uses: actions/upload-artifact@v3
69+
uses: actions/upload-artifact@v4
7070
with:
7171
name: RPM-build-results_SFOS3.1.0-3.2.1
7272
path: RPMS/

.github/workflows/build-sfos3.3.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ concurrency:
3232

3333
jobs:
3434
build:
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
env:
3737
# Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
3838
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
3939
steps:
4040

4141
- name: Checkout
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343

4444
# Caching Docker images is not ready yet, see
4545
# https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
@@ -72,7 +72,7 @@ jobs:
7272
arch: i486
7373

7474
- name: Upload build results
75-
uses: actions/upload-artifact@v3
75+
uses: actions/upload-artifact@v4
7676
with:
7777
name: RPM-build-results_SFOS3.3.0-4.1.0
7878
path: RPMS/

.github/workflows/build-sfos4.2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ concurrency:
3232

3333
jobs:
3434
build:
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
env:
3737
# Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
3838
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
3939
steps:
4040

4141
- name: Checkout
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343

4444
# Caching Docker images is not ready yet, see
4545
# https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
@@ -72,7 +72,7 @@ jobs:
7272
arch: i486
7373

7474
- name: Upload build results
75-
uses: actions/upload-artifact@v3
75+
uses: actions/upload-artifact@v4
7676
with:
7777
name: RPM-build-results_SFOS4.2.0+
7878
path: RPMS/
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: CI - sfos4.2 branch on SDK for 4.3.0 (aarch64,armv7hl,i486)
2+
3+
env:
4+
# For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
5+
# Binaries for 4.3.0 are known to run on the most recent SFOS release (5.0.0 as of April 2025),
6+
# but when this breaks a new CI workflow configuration file shall be created from this one for the
7+
# "oldest common denominator"-SDK known to generate binaries which run on the then current SailfishOS release.
8+
RELEASE: 4.3.0.12
9+
10+
on:
11+
push:
12+
tags:
13+
- 'release*_sfos4.2/*'
14+
- 'rc*_sfos4.2/*'
15+
- 'beta*_sfos4.2/*'
16+
- 'alpha*_sfos4.2/*'
17+
- 'sfos4.2/*'
18+
# Allows to run this workflow manually from the Actions tab.
19+
#workflow_dispatch:
20+
# Rather set a new release in the spec file and a new tag in the format N/X.Y.Z (e.g., release2_sfos4.2/0.6.3) to build a release version again.
21+
22+
defaults:
23+
run:
24+
# Note that 'bash' provides -o pipefail, in contrast to the default (i.e., unspecified, which also uses bash) or 'sh',
25+
# see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
26+
shell: sh
27+
28+
# 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
29+
concurrency:
30+
group: ci-${{ github.ref_name }}
31+
# 'false' (default) allows for two concurrent runs, one executing and one freshly enqueued; 'true' for only one; no 'concurrency:' defined for multiple.
32+
cancel-in-progress: false
33+
34+
jobs:
35+
build:
36+
runs-on: ubuntu-24.04
37+
env:
38+
# Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
39+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
40+
steps:
41+
42+
- name: Checkout
43+
uses: actions/checkout@v4
44+
45+
# Caching Docker images is not ready yet, see
46+
# https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
47+
#- name: Cache Docker images of the Sailfish-SDK
48+
# id: cache-sdk
49+
# uses: actions/cache@v3
50+
# with:
51+
# path: $GITHUB_WORKSPACE/…
52+
# key: cache
53+
54+
- name: Prepare
55+
run: mkdir RPMS
56+
57+
- name: Build aarch64 on ${{ env.RELEASE }}
58+
uses: coderus/github-sfos-build@master
59+
with:
60+
release: ${{ env.RELEASE }}
61+
arch: aarch64
62+
63+
- name: Build armv7hl on ${{ env.RELEASE }}
64+
uses: coderus/github-sfos-build@master
65+
with:
66+
release: ${{ env.RELEASE }}
67+
arch: armv7hl
68+
69+
- name: Build i486 on ${{ env.RELEASE }}
70+
uses: coderus/github-sfos-build@master
71+
with:
72+
release: ${{ env.RELEASE }}
73+
arch: i486
74+
75+
- name: Upload build results
76+
uses: actions/upload-artifact@v4
77+
with:
78+
name: RPM-build-results_SFOS4.3.0+
79+
path: RPMS/
80+
81+
# Just for fun, see https://feathericons.com/ and
82+
# https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#branding
83+
#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
84+
# icon: 'gift'
85+
# color: 'purple'
86+

.github/workflows/build-sfos4.2_latest.yml renamed to .github/workflows/build-sfos4.2_sdk-latest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: CI - sfos4.2 branch on latest SDK (aarch64,armv7hl,i486)
22

33
env:
4-
# For the latest available docker image, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
5-
RELEASE: 4.5.0.16
4+
# For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
5+
RELEASE: 5.0.0.43
66

77
on:
88
push:
@@ -33,14 +33,14 @@ concurrency:
3333

3434
jobs:
3535
build:
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-24.04
3737
env:
3838
# Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
3939
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
4040
steps:
4141

4242
- name: Checkout
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444

4545
# Caching Docker images is not ready yet, see
4646
# https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
@@ -73,7 +73,7 @@ jobs:
7373
arch: i486
7474

7575
- name: Upload build results
76-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@v4
7777
with:
7878
name: RPM-build-results_SFOS${{ env.RELEASE }}+
7979
path: RPMS/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The [Storeman Installer](https://github.com/storeman-developers/harbour-storeman
3434
## Important notes
3535

3636
* If you experience issues when installing, removing or updating packages after a SailfishOS upgrade, try running `devel-su pkcon refresh` in a terminal app.
37-
* Starting with version 0.2.9, Storeman is built by the help of the SailfishOS-OBS and initially installed by the Storeman Installer (or manually). To update from Storeman < 0.2.9 (needs SailfishOS ≥ 3.1.0), one should reinstall Storeman via the Storeman Installer (which installs the current Storeman release, and since Storeman Installer 1.3.0 automatically removes a Storeman < 0.3.0 before that) or manually remove Storeman < 0.2.9 and install Storeman ≥ 0.3.0. After an initial installation of Storeman ≥ 0.3.0, further updates of Storeman will be performed within Storeman, as usual.
37+
* Starting with version 0.2.9, Storeman is built by the help of the SailfishOS-OBS and initially installed by the Storeman Installer (or manually). To update from Storeman < 0.2.9 (requires SailfishOS ≥ 3.1.0), one should either reinstall Storeman via the Storeman Installer (which installs the current Storeman release from the SailfishOS-OBS for SailfishOS ≥ 3.4.0, and since Storeman Installer 1.3.0 automatically removes a Storeman < 0.3.0 before that), or manually remove Storeman < 0.2.9 and install Storeman ≥ 0.3.0. After an initial installation of Storeman ≥ 0.3.0, further updates of Storeman will be performed within Storeman, as usual.
3838
* Before software can be build for a new SailfishOS release at the SailfishOS-OBS, Jolla must create a [corresponding "download on demand (DoD)" OBS-repository](https://build.sailfishos.org/project/subprojects/sailfishos). Before that is employed by Jolla, Storeman's download repository for this new SailfishOS release will usually be mapped to the prior SailfishOS release by [its OBS-meta-configuration](https://build.sailfishos.org/project/meta/home:olf:harbour-storeman), in hope that there is no change in the new SailfishOS release which breaks Storeman; if there is, please report that soon at [Storeman's issue tracker](https://github.com/storeman-developers/harbour-storeman/issues).
3939
* Disclaimer: Storeman and its installer may still have flaws, kill your kittens or break your SailfishOS installation! Although this is very unlikely after years of testing by many users, new flaws may be introduced in any release (as for any software). Mind that the license you implicitly accept by using Storeman or Storeman Installer excludes any liability.
4040

qml/models/TranslatorsModel.qml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ ListModel {
7777
ListElement { name: "raketti" },
7878
ListElement { name: "direc85" }
7979
]
80-
reviewers: []
80+
reviewers: [
81+
ListElement { name: "tuplasuhveli" }
82+
]
8183
}
8284

8385
ListElement {
@@ -113,7 +115,9 @@ ListModel {
113115
translators: [
114116
ListElement { name: "claustn" }
115117
]
116-
reviewers: []
118+
reviewers: [
119+
ListElement { name: "legacychimera247" }
120+
]
117121
}
118122

119123
ListElement {
@@ -139,7 +143,9 @@ ListModel {
139143
coordinators: [
140144
ListElement { name: "storeslem" }
141145
]
142-
translators: []
146+
translators: [
147+
ListElement { name: "fsilye" }
148+
]
143149
reviewers: []
144150
}
145151

qml/pages/AuthorisationDialog.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ Dialog {
6060
TextField {
6161
id: usernameField
6262
width: parent.width
63-
//: A translated string should not be longer than the original
64-
//% "Username or e-mail address"
63+
//: A translated string should comprise less than 27 characters
64+
//% "Username"
6565
placeholderText: qsTrId("orn-username")
6666
label: placeholderText
6767
validator: RegExpValidator {

rpm/harbour-storeman.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* Mon Feb 02 2026 olf <Olf0@users.noreply.github.com> - 0.7.3
2+
- Update translations: Tartar (`tt`) by @arustg (#517), Swedish (`sv`) by @eson57 (#516), Slovenian (`sl`; #525), Slovak (`sk`) by @holask (#524), French (`fr`; #520), Estonian (`et`) by [**tlend\@transifex**](https://app.transifex.com/user/profile/tlend/) (#519), German (`de`; #518), Hungarian (`hu`) by @martonmiklos (#521), Spanish (`es`) by @carmenfdezb (#526), Polish (`pl`) by @atlochowski (#522), Russian (`ru`) by @dikonov / @arustg (#523), Finnish (`fi`) by @tuplasuhveli (#531, #534)
3+
- Revived Italian (`it`) translation by @legacychimera247 (#532).
4+
- Overhaul Norwegian (Bokmål) translation (`no`; #537, #538)
5+
16
* Mon Nov 25 2024 olf <Olf0@users.noreply.github.com> - 0.7.2
27
- Rework OBS repository handling, part 2: Improve (#498)
38
- Fix, comment and enhance `%post` scriptlet (#505)

0 commit comments

Comments
 (0)