From bbbe27b18839b61cd38e93d68943b67279690f8d Mon Sep 17 00:00:00 2001 From: BigmenPixel0 Date: Sat, 21 Oct 2023 15:55:39 +0500 Subject: [PATCH] flatpak: Change the branch to stable --- .github/workflows/flatpak.yml | 45 +++++++++++++++++++++++++-------- share/org.getmonero.Monero.yaml | 34 ++++++++++++------------- 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 27fb33260f..6906367b3b 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -10,14 +10,14 @@ jobs: if: github.repository == 'monero-project/monero-gui' runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08 + image: bilelmoussaoui/flatpak-github-actions:kde-5.15-23.08 options: --privileged strategy: matrix: arch: [x86_64, aarch64] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive @@ -25,10 +25,20 @@ jobs: run: dnf -y install docker - name: Setup QEMU + if: ${{ matrix.arch != 'x86_64' }} uses: docker/setup-qemu-action@v2 with: platforms: arm64 + - name: Lint the manifest + uses: addnab/docker-run-action@v3 + with: + registry: ghcr.io + image: ghcr.io/flathub/flatpak-builder-lint:latest + options: -v ${{ github.workspace }}:/monero-gui + run: | + flatpak-builder-lint manifest /monero-gui/share/org.getmonero.Monero.yaml + - name: Build flatpak uses: flatpak/flatpak-github-actions/flatpak-builder@v6 env: @@ -38,6 +48,9 @@ jobs: arch: ${{ matrix.arch }} cache: false stop-at-module: boost + mirror-screenshots-url: https://dl.flathub.org/repo/screenshots + build-log-url: https://github.com/monero-project/monero-gui/actions/runs/${{ github.run_id }} + branch: stable - name: Tar flatpak-builder run: tar -cvf flatpak-builder.tar .flatpak-builder @@ -54,19 +67,20 @@ jobs: needs: part1 runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08 + image: bilelmoussaoui/flatpak-github-actions:kde-5.15-23.08 options: --privileged strategy: matrix: arch: [x86_64, aarch64] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install deps run: dnf -y install docker - name: Setup QEMU + if: ${{ matrix.arch != 'x86_64' }} uses: docker/setup-qemu-action@v2 with: platforms: arm64 @@ -88,6 +102,9 @@ jobs: arch: ${{ matrix.arch }} cache: false stop-at-module: monero-gui + mirror-screenshots-url: https://dl.flathub.org/repo/screenshots + build-log-url: https://github.com/monero-project/monero-gui/actions/runs/${{ github.run_id }} + branch: stable - name: Tar flatpak-builder run: tar -cvf flatpak-builder.tar .flatpak-builder @@ -104,26 +121,27 @@ jobs: needs: [part1, part2] runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08 + image: bilelmoussaoui/flatpak-github-actions:kde-5.15-23.08 options: --privileged strategy: matrix: arch: [x86_64, aarch64] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive - name: Add version and date run: | - sed -i 's//${{ github.event.release.tag_name }}/g' $GITHUB_WORKSPACE/share/org.getmonero.Monero.metainfo.xml - sed -i 's//'"$(date '+%F')"'/g' $GITHUB_WORKSPACE/share/org.getmonero.Monero.metainfo.xml + sed -i 's//${{ github.event.release.tag_name }}/g' ${{ github.workspace }}/share/org.getmonero.Monero.metainfo.xml + sed -i 's//'"$(date '+%F')"'/g' ${{ github.workspace }}/share/org.getmonero.Monero.metainfo.xml - name: Install deps run: dnf -y install docker - name: Setup QEMU + if: ${{ matrix.arch != 'x86_64' }} uses: docker/setup-qemu-action@v2 with: platforms: arm64 @@ -144,6 +162,13 @@ jobs: manifest-path: share/org.getmonero.Monero.yaml arch: ${{ matrix.arch }} cache: false + mirror-screenshots-url: https://dl.flathub.org/repo/screenshots + build-log-url: https://github.com/monero-project/monero-gui/actions/runs/${{ github.run_id }} + branch: stable + + - name: Commit screenshots to OSTree + run: | + ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots - name: Validate AppData working-directory: flatpak_app/files/share/appdata @@ -170,5 +195,5 @@ jobs: uses: flatpak/flatpak-github-actions/flat-manager@v6 with: flat-manager-url: https://hub.flathub.org - repository: beta - token: ${{ secrets.FLATHUB_ }} + repository: stable + token: ${{ secrets.FLATHUB_TOKEN }} diff --git a/share/org.getmonero.Monero.yaml b/share/org.getmonero.Monero.yaml index 0d83c8b5eb..e6b7e2a6ea 100644 --- a/share/org.getmonero.Monero.yaml +++ b/share/org.getmonero.Monero.yaml @@ -1,6 +1,6 @@ app-id: org.getmonero.Monero runtime: org.kde.Platform -runtime-version: 5.15-22.08 +runtime-version: 5.15-23.08 sdk: org.kde.Sdk finish-args: - --share=network @@ -29,8 +29,8 @@ modules: sources: - type: git url: https://github.com/protocolbuffers/protobuf - tag: v22.4 - commit: 40e1daca18708c21c7edf07c489a688355bd297b + tag: v24.4 + commit: 7789b3ac85248ad75631a1919071fa268e466210 - name: boost buildsystem: simple @@ -40,22 +40,22 @@ modules: - ./b2 -j$FLATPAK_BUILDER_N_JOBS install variant=release --layout=system sources: - type: archive - url: https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz - sha256: 66a469b6e608a51f8347236f4912e27dc5c60c60d7d53ae9bfe4683316c6f04c + url: https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.gz + sha256: c0685b68dd44cc46574cce86c4e17c0f611b15e195be9848dfd0769a0a207628 - name: libunbound config-opts: - --with-libunbound-only sources: - type: archive - url: https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz - sha256: ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 + url: https://nlnetlabs.nl/downloads/unbound/unbound-1.18.0.tar.gz + sha256: 3da95490a85cff6420f26fae0b84a49f5112df1bf1b7fc34f8724f02082cb712 - name: libsodium sources: - type: archive - url: https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz - sha256: 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 + url: https://github.com/jedisct1/libsodium/releases/download/1.0.19-RELEASE/libsodium-1.0.19.tar.gz + sha256: 018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea - name: libusb sources: @@ -69,8 +69,8 @@ modules: - -DCMAKE_BUILD_TYPE=Release sources: - type: archive - url: https://github.com/libusb/hidapi/archive/hidapi-0.13.1.tar.gz - sha256: 476a2c9a4dc7d1fc97dd223b84338dbea3809a84caea2dcd887d9778725490e3 + url: https://github.com/libusb/hidapi/archive/hidapi-0.14.0.tar.gz + sha256: a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd - name: libzmq config-opts: @@ -78,8 +78,8 @@ modules: - --disable-Werror sources: - type: archive - url: https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz - sha256: c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5 + url: https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz + sha256: 6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 - name: libgss sources: @@ -93,8 +93,8 @@ modules: - -DCMAKE_BUILD_TYPE=Release sources: - type: archive - url: https://github.com/libuv/libuv/archive/v1.44.2.tar.gz - sha256: e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da + url: https://github.com/libuv/libuv/archive/v1.46.0.tar.gz + sha256: 7aa66be3413ae10605e1f5c9ae934504ffe317ef68ea16fdaa83e23905c681bd - name: p2pool buildsystem: cmake-ninja @@ -104,8 +104,8 @@ modules: sources: - type: git url: https://github.com/SChernykh/p2pool - tag: v3.2 - commit: 92827035e07ff15da6b7645a332f3e59aa0ab1c4 + tag: v3.7 + commit: 2ed63ab3acad15bd794eec72e54a18c65a4bd0e2 post-install: - install -Dm755 p2pool $FLATPAK_DEST/bin/p2pool