Skip to content

Commit da8f0d9

Browse files
q7nmq7nm
committed
flatpak: Change the branch to stable
1 parent f0b1b8c commit da8f0d9

3 files changed

Lines changed: 100 additions & 74 deletions

File tree

‎.github/workflows/flatpak.yml‎

Lines changed: 76 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,48 @@ jobs:
99
name: Part 1/3
1010
if: github.repository == 'monero-project/monero-gui'
1111
runs-on: ubuntu-latest
12-
container:
13-
image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
14-
options: --privileged
1512
strategy:
1613
matrix:
1714
arch: [x86_64, aarch64]
15+
container:
16+
image: ghcr.io/flathub-infra/flatpak-github-actions:kde-5.15-23.08
17+
options: --privileged
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
submodules: recursive
2323

24-
- name: Install deps
25-
run: dnf -y install docker
24+
- name: Install Docker
25+
if: ${{ matrix.arch != 'x86_64' }}
26+
run: |
27+
curl https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz --output ./docker.tgz
28+
tar xzvf docker.tgz
29+
mv docker/* /usr/bin
2630
2731
- name: Setup QEMU
28-
uses: docker/setup-qemu-action@v2
29-
with:
30-
platforms: arm64
32+
if: ${{ matrix.arch != 'x86_64' }}
33+
uses: docker/setup-qemu-action@v3.0.0
34+
35+
- name: Validate Flatpak manifest
36+
run: flatpak-builder-lint manifest share/org.getmonero.Monero.yaml
3137

3238
- name: Build flatpak
33-
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
39+
uses: flathub-infra/flatpak-github-actions/flatpak-builder@6d0dd363260c9917f0bca469ec21370bb45a5b9f
3440
env:
3541
FLATPAK_BUILDER_N_JOBS: 3
3642
with:
3743
manifest-path: share/org.getmonero.Monero.yaml
3844
arch: ${{ matrix.arch }}
3945
cache: false
4046
stop-at-module: boost
47+
branch: stable
4148

4249
- name: Tar flatpak-builder
4350
run: tar -cvf flatpak-builder.tar .flatpak-builder
4451

4552
- name: Save flatpak-builder
46-
uses: actions/upload-artifact@v3
53+
uses: actions/upload-artifact@v4
4754
with:
4855
name: flatpak-builder-${{ matrix.arch }}
4956
path: flatpak-builder.tar
@@ -53,106 +60,126 @@ jobs:
5360
if: github.repository == 'monero-project/monero-gui'
5461
needs: part1
5562
runs-on: ubuntu-latest
56-
container:
57-
image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
58-
options: --privileged
5963
strategy:
6064
matrix:
6165
arch: [x86_64, aarch64]
66+
container:
67+
image: ghcr.io/flathub-infra/flatpak-github-actions:kde-5.15-23.08
68+
options: --privileged
6269
steps:
6370
- name: Checkout
64-
uses: actions/checkout@v3
71+
uses: actions/checkout@v4
6572

66-
- name: Install deps
67-
run: dnf -y install docker
73+
- name: Install Docker
74+
if: ${{ matrix.arch != 'x86_64' }}
75+
run: |
76+
curl https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz --output ./docker.tgz
77+
tar xzvf docker.tgz
78+
mv docker/* /usr/bin
6879
6980
- name: Setup QEMU
70-
uses: docker/setup-qemu-action@v2
71-
with:
72-
platforms: arm64
81+
if: ${{ matrix.arch != 'x86_64' }}
82+
uses: docker/setup-qemu-action@v3.0.0
7383

7484
- name: Restore flatpak-builder
75-
uses: actions/download-artifact@v3
85+
uses: actions/download-artifact@v4
7686
with:
7787
name: flatpak-builder-${{ matrix.arch }}
7888

7989
- name: Untar flatpak-builder
8090
run: tar -xvf flatpak-builder.tar
8191

8292
- name: Build flatpak
83-
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
93+
uses: flathub-infra/flatpak-github-actions/flatpak-builder@6d0dd363260c9917f0bca469ec21370bb45a5b9f
8494
env:
8595
FLATPAK_BUILDER_N_JOBS: 3
8696
with:
8797
manifest-path: share/org.getmonero.Monero.yaml
8898
arch: ${{ matrix.arch }}
8999
cache: false
90100
stop-at-module: monero-gui
101+
branch: stable
91102

92103
- name: Tar flatpak-builder
93104
run: tar -cvf flatpak-builder.tar .flatpak-builder
94105

95106
- name: Save flatpak-builder
96-
uses: actions/upload-artifact@v3
107+
uses: actions/upload-artifact@v4
97108
with:
98109
name: flatpak-builder-${{ matrix.arch }}
99110
path: flatpak-builder.tar
111+
overwrite: true
100112

101113
part3:
102114
name: Part 3/3
103115
if: github.repository == 'monero-project/monero-gui'
104116
needs: [part1, part2]
105117
runs-on: ubuntu-latest
106-
container:
107-
image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08
108-
options: --privileged
109118
strategy:
110119
matrix:
111120
arch: [x86_64, aarch64]
121+
container:
122+
image: ghcr.io/flathub-infra/flatpak-github-actions:kde-5.15-23.08
123+
options: --privileged
112124
steps:
113125
- name: Checkout
114-
uses: actions/checkout@v3
126+
uses: actions/checkout@v4
115127
with:
116128
submodules: recursive
117129

130+
- name: Install Docker
131+
if: ${{ matrix.arch != 'x86_64' }}
132+
run: |
133+
curl https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz --output ./docker.tgz
134+
tar xzvf docker.tgz
135+
mv docker/* /usr/bin
136+
137+
- name: Setup QEMU
138+
if: ${{ matrix.arch != 'x86_64' }}
139+
uses: docker/setup-qemu-action@v3.0.0
140+
118141
- name: Add version and date
119142
run: |
120143
sed -i 's/<version>/${{ github.event.release.tag_name }}/g' $GITHUB_WORKSPACE/share/org.getmonero.Monero.metainfo.xml
121144
sed -i 's/<date>/'"$(date '+%F')"'/g' $GITHUB_WORKSPACE/share/org.getmonero.Monero.metainfo.xml
122145
123-
- name: Install deps
124-
run: dnf -y install docker
125-
126-
- name: Setup QEMU
127-
uses: docker/setup-qemu-action@v2
128-
with:
129-
platforms: arm64
130-
131146
- name: Restore flatpak-builder
132-
uses: actions/download-artifact@v3
147+
uses: actions/download-artifact@v4
133148
with:
134149
name: flatpak-builder-${{ matrix.arch }}
135150

136151
- name: Untar flatpak-builder
137152
run: tar -xvf flatpak-builder.tar
138153

154+
- name: Delete flatpak-builder
155+
uses: geekyeggo/delete-artifact@v4
156+
with:
157+
name: flatpak-builder-${{ matrix.arch }}
158+
139159
- name: Build flatpak
140-
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
160+
uses: flathub-infra/flatpak-github-actions/flatpak-builder@6d0dd363260c9917f0bca469ec21370bb45a5b9f
141161
env:
142162
FLATPAK_BUILDER_N_JOBS: 3
143163
with:
144164
manifest-path: share/org.getmonero.Monero.yaml
145165
arch: ${{ matrix.arch }}
146166
cache: false
167+
branch: stable
168+
mirror-screenshots-url: https://dl.flathub.org/media
147169

148-
- name: Validate AppData
149-
working-directory: flatpak_app/files/share/appdata
150-
run: appstream-util validate org.getmonero.Monero.appdata.xml
170+
- name: Validate AppStream
171+
run: flatpak-builder-lint appstream flatpak_app/files/share/metainfo/org.getmonero.Monero.metainfo.xml
151172

152-
- name: Delete flatpak-builder
153-
uses: geekyeggo/delete-artifact@v2
154-
with:
155-
name: flatpak-builder-${{ matrix.arch }}
173+
- name: Verify Icon and Metadata in app-info
174+
run: |
175+
test -f flatpak_app/files/share/app-info/icons/flatpak/128x128/org.getmonero.Monero.png || { echo "::error::Missing 128x128 icon in app-info"; exit 1; }
176+
test -f flatpak_app/files/share/app-info/xmls/org.getmonero.Monero.xml.gz || { echo "::error::Missing org.getmonero.Monero.xml.gz in app-info"; exit 1; }
177+
178+
- name: Validate build directory
179+
run: flatpak-builder-lint builddir flatpak_app
180+
181+
- name: Validate repository
182+
run: flatpak-builder-lint repo repo
156183

157184
- name: Print hashes
158185
working-directory: flatpak_app/files/bin
@@ -166,9 +193,10 @@ jobs:
166193
echo "$ flatpak run --command=sha256sum org.getmonero.Monero /app/bin/monero-wallet-gui" >> $GITHUB_STEP_SUMMARY
167194
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
168195
169-
- name: Publish to Flathub Beta
170-
uses: flatpak/flatpak-github-actions/flat-manager@v6
196+
- name: Publish to Flathub
197+
uses: flathub-infra/flatpak-github-actions/flat-manager@6d0dd363260c9917f0bca469ec21370bb45a5b9f
171198
with:
172199
flat-manager-url: https://hub.flathub.org
173-
repository: beta
174-
token: ${{ secrets.FLATHUB_ }}
200+
repository: stable
201+
build-log-url: https://github.com/monero-project/monero-gui/actions/runs/${{ github.run_id }}
202+
token: ${{ secrets.FLATHUB_TOKEN }}

‎share/org.getmonero.Monero.metainfo.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
<metadata_license>CC0-1.0</metadata_license>
55
<project_license>BSD-3-Clause</project_license>
66
<content_rating type="oars-1.1"/>
7-
<developer_name>The Monero Project</developer_name>
7+
<developer id="org.getmonero">
8+
<name>The Monero Project</name>
9+
</developer>
810
<categories>
911
<category>Network</category>
1012
<category>Qt</category>
@@ -51,7 +53,6 @@
5153
<url type="donation">https://getmonero.org/get-started/contributing</url>
5254
<url type="faq">https://getmonero.org/get-started/faq</url>
5355
<url type="help">https://getmonero.org/resources/user-guides</url>
54-
<url type="translate">https://translate.getmonero.org</url>
5556
<url type="contact">https://getmonero.org/community/hangouts</url>
5657
<url type="contribute">https://getmonero.org/get-started/contributing</url>
5758

‎share/org.getmonero.Monero.yaml‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
app-id: org.getmonero.Monero
22
runtime: org.kde.Platform
3-
runtime-version: 5.15-22.08
3+
runtime-version: 5.15-23.08
44
sdk: org.kde.Sdk
55
finish-args:
66
- --share=network
77
- --share=ipc
8-
- --socket=x11
8+
- --socket=fallback-x11
99
- --socket=wayland
1010
- --device=all
1111
- --filesystem=~/Monero:create
@@ -23,14 +23,10 @@ cleanup:
2323
command: monero-wallet-gui
2424
modules:
2525
- name: protobuf
26-
buildsystem: cmake-ninja
27-
config-opts:
28-
- -DCMAKE_BUILD_TYPE=Release
2926
sources:
30-
- type: git
31-
url: https://github.com/protocolbuffers/protobuf
32-
tag: v22.4
33-
commit: 40e1daca18708c21c7edf07c489a688355bd297b
27+
- type: archive
28+
url: https://github.com/protocolbuffers/protobuf/releases/download/v21.3/protobuf-cpp-3.21.3.tar.gz
29+
sha256: c98a4f17ed57e9e4dafc4a52e76ee012f9a6a13750488b20b4c370a3eb1561fc
3430

3531
- name: boost
3632
buildsystem: simple
@@ -40,22 +36,22 @@ modules:
4036
- ./b2 -j$FLATPAK_BUILDER_N_JOBS install variant=release --layout=system
4137
sources:
4238
- type: archive
43-
url: https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz
44-
sha256: 66a469b6e608a51f8347236f4912e27dc5c60c60d7d53ae9bfe4683316c6f04c
39+
url: https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.gz
40+
sha256: a5800f405508f5df8114558ca9855d2640a2de8f0445f051fa1c7c3383045724
4541

4642
- name: libunbound
4743
config-opts:
4844
- --with-libunbound-only
4945
sources:
5046
- type: archive
51-
url: https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz
52-
sha256: ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4
47+
url: https://nlnetlabs.nl/downloads/unbound/unbound-1.19.3.tar.gz
48+
sha256: 3ae322be7dc2f831603e4b0391435533ad5861c2322e34a76006a9fb65eb56b9
5349

5450
- name: libsodium
5551
sources:
5652
- type: archive
57-
url: https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz
58-
sha256: 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
53+
url: https://github.com/jedisct1/libsodium/releases/download/1.0.19-RELEASE/libsodium-1.0.19.tar.gz
54+
sha256: 018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea
5955

6056
- name: libusb
6157
sources:
@@ -69,17 +65,17 @@ modules:
6965
- -DCMAKE_BUILD_TYPE=Release
7066
sources:
7167
- type: archive
72-
url: https://github.com/libusb/hidapi/archive/hidapi-0.13.1.tar.gz
73-
sha256: 476a2c9a4dc7d1fc97dd223b84338dbea3809a84caea2dcd887d9778725490e3
68+
url: https://github.com/libusb/hidapi/archive/hidapi-0.14.0.tar.gz
69+
sha256: a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd
7470

7571
- name: libzmq
7672
config-opts:
7773
- --with-libsodium
7874
- --disable-Werror
7975
sources:
8076
- type: archive
81-
url: https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz
82-
sha256: c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5
77+
url: https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz
78+
sha256: 6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
8379

8480
- name: libgss
8581
sources:
@@ -93,8 +89,8 @@ modules:
9389
- -DCMAKE_BUILD_TYPE=Release
9490
sources:
9591
- type: archive
96-
url: https://github.com/libuv/libuv/archive/v1.44.2.tar.gz
97-
sha256: e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da
92+
url: https://github.com/libuv/libuv/archive/v1.47.0.tar.gz
93+
sha256: d50af7e6d72526db137e66fad812421c8a1cae09d146b0ec2bb9a22c5f23ba93
9894

9995
- name: p2pool
10096
buildsystem: cmake-ninja
@@ -104,8 +100,8 @@ modules:
104100
sources:
105101
- type: git
106102
url: https://github.com/SChernykh/p2pool
107-
tag: v3.2
108-
commit: 92827035e07ff15da6b7645a332f3e59aa0ab1c4
103+
tag: v3.10
104+
commit: 3797f017e94047a41e5f622e1a299c6f71c37df0
109105
post-install:
110106
- install -Dm755 p2pool $FLATPAK_DEST/bin/p2pool
111107

@@ -130,4 +126,5 @@ modules:
130126
post-install:
131127
- install -Dpm644 share/org.getmonero.Monero.desktop $FLATPAK_DEST/share/applications/$FLATPAK_ID.desktop
132128
- install -Dpm644 share/org.getmonero.Monero.metainfo.xml $FLATPAK_DEST/share/metainfo/$FLATPAK_ID.metainfo.xml
133-
- for x in 16 24 32 48 64 96 128 256; do install -Dpm644 images/appicons/${x}x${x}.png $FLATPAK_DEST/share/icons/hicolor/${x}x${x}/apps/$FLATPAK_ID.png; done
129+
- for x in 16 24 32 48 64 96 128 256; do install -Dpm644 images/appicons/${x}x${x}.png
130+
$FLATPAK_DEST/share/icons/hicolor/${x}x${x}/apps/$FLATPAK_ID.png; done

0 commit comments

Comments
 (0)