Fix Flatpak workflow

Author: ben221199

.github/workflows/flatpak-beta.yml

@@ -6,21 +6,31 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, ubuntu-24.04-arm]
+    runs-on: {{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Install Flatpak
         run: sudo apt install flatpak flatpak-builder
       - name: Setup Flatpak
         run: |
           flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak install flathub org.gnome.Platform//3.36 org.gnome.Sdk//3.36 -y
+          flatpak install flathub org.freedesktop.Platform org.freedesktop.Sdk -y
       - name: Build Flatpak
-        run: flatpak-builder --repo=repo --force-clean build-dir .flatpak/org.lbry.cli.json
+        run: flatpak-builder --repo=repo --force-clean build-dir org.lbry.cli.json
       - name: Build Bundle
-        run: flatpak build-bundle repo lbry-cli-${GITHUB_SHA::8}.flatpak org.lbry.cli
-      - name: Upload Flatpak
+        run: flatpak build-bundle repo lbry-cli.flatpak org.lbry.cli
+      - name: Upload Flatpak (x86)
+        if: ${{ matrix.os == 'ubuntu-24.04' }}
         uses: actions/upload-artifact@v4
         with:
-          name: lbry-cli.flatpak
-          path: ./lbry-cli-*.flatpak
+          name: lbry-cli_x86_64.flatpak
+          path: ./lbry-cli.flatpak
+      - name: Upload Flatpak (ARM)
+        if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: lbry-cli_aarch64.flatpak
+          path: ./lbry-cli.flatpak

org.lbry.cli.json

@@ -0,0 +1,106 @@
+{
+  "id": "org.lbry.cli",
+  "runtime": "org.freedesktop.Platform",
+  "runtime-version": "25.08",
+  "sdk": "org.freedesktop.Sdk",
+  "sdk-extensions": [
+    "org.freedesktop.Sdk.Extension.golang"
+  ],
+  "build-options": {
+    "append-path": "/usr/lib/sdk/golang/bin"
+  },
+  "command": "lbry-cli",
+  "finish-args": [
+    "--share=network"
+  ],
+  "cleanup": [
+    "/go"
+  ],
+  "modules": [
+    {
+      "name": "lbry-cli",
+      "buildsystem": "simple",
+      "build-commands": [
+        "go build -mod=vendor -o lbry-cli",
+        "install -Dm00755 lbry-cli $FLATPAK_DEST/bin/lbry-cli",
+        "install -Dm00644 $FLATPAK_ID.metainfo.xml $FLATPAK_DEST/share/metainfo/$FLATPAK_ID.metainfo.xml",
+        "install -Dm00644 $FLATPAK_ID.appdata.xml $FLATPAK_DEST/share/appdata/$FLATPAK_ID.appdata.xml"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/LBRYFoundation/lbry-cli.git",
+          "commit": "0d3cb17ace4b29495f4a03b72d375257ba910837"
+        },
+        {
+          "type": "file",
+          "dest": "vendor",
+          "path": "modules.txt"
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/github.com/ivanpirog/coloredcobra/@v/v1.0.1.zip",
+          "dest": "vendor/github.com/ivanpirog/coloredcobra",
+          "sha256": "417b2b8f75ea20cbfd6b0ddd339a16642a389247b4ad2884e0445753468f443b",
+          "strip-components": 3
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/github.com/spf13/cobra/@v/v1.10.1.zip",
+          "dest": "vendor/github.com/spf13/cobra",
+          "sha256": "00955783267c9ced54274df456377a15bc1b658362f93f85dfda0708b54f9a28",
+          "strip-components": 3
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/github.com/spf13/pflag/@v/v1.0.10.zip",
+          "dest": "vendor/github.com/spf13/pflag",
+          "sha256": "a246b8c9d3daa87d6c634cdfee1bdf7fa53d5817eeef4fa0c6da43edd12de4ca",
+          "strip-components": 3
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/github.com/ybbus/jsonrpc/v3/@v/v3.1.6.zip",
+          "dest": "vendor/github.com/ybbus/jsonrpc/v3",
+          "sha256": "6cdf58411d99029e42a13e4bd4a2d427cbf44e5a650cc0082ac31a46fc7fe0ef",
+          "strip-components": 4
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/github.com/fatih/color/@v/v1.18.0.zip",
+          "dest": "vendor/github.com/fatih/color",
+          "sha256": "4dc6907b7f6807b37c21ad527d966437d398f03472115f471eaa8fe5875363d3",
+          "strip-components": 3
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/github.com/inconshreveable/mousetrap/@v/v1.1.0.zip",
+          "dest": "vendor/github.com/inconshreveable/mousetrap",
+          "sha256": "526674de624d7db108cfe7653ef110ccdfd97bc85026254224815567928ed243",
+          "strip-components": 3
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/github.com/mattn/go-colorable/@v/v0.1.14.zip",
+          "dest": "vendor/github.com/mattn/go-colorable",
+          "sha256": "5e0e7925a070bb5bd11b4097e1a7b608167f0217ee83901b44c135f6e5e85c78",
+          "strip-components": 3
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/github.com/mattn/go-isatty/@v/v0.0.20.zip",
+          "dest": "vendor/github.com/mattn/go-isatty",
+          "sha256": "f2d5f89ca451577e17464b9bb596dc0d0ecececb5eaa63622c41b57cd0b7b8cc",
+          "strip-components": 3
+        },
+        {
+          "type": "archive",
+          "url": "https://proxy.golang.org/golang.org/x/sys/@v/v0.36.0.zip",
+          "dest": "vendor/golang.org/x/sys",
+          "sha256": "894ee9a48e191265cd3d2200ddd81b8d75c554a0eabe9fc1a9afbab25a4b29c4",
+          "strip-components": 3
+        }
+      ]
+    }
+  ]
+}