From 5cd19d05cb07bb389d82d0e200d9ee5f418f332f Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Sat, 31 Oct 2026 15:33:04 -0400
Subject: [PATCH] ci(flatpak): publish Flatpak OCI layout to GHCR alongside
 Flatpak builds (#113)

---
 .github/workflows/flatpak-oci.yml | 74 +++++++++++++++++++++++++++++++
 .github/workflows/release.yml     | 16 ++++++-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/flatpak-oci.yml

diff --git a/.github/workflows/flatpak-oci.yml b/.github/workflows/flatpak-oci.yml
new file mode 100644
index 0000000..05e72e9
--- /dev/null
+++ b/.github/workflows/flatpak-oci.yml
@@ -0,0 +1,74 @@
+name: "Flatpak OCI"
+
+# Reusable workflow to package and publish a Flatpak application as an OCI image to GHCR.
+# Pairs with the Flatpak Registry Index Protocol implemented in artcraft-services.
+on:
+  workflow_call:
+    inputs:
+      app-name:
+        description: "Application repository name (e.g. pdfcraft, cadcraft)"
+        type: string
+        required: true
+      version:
+        description: "Release version string (e.g. 0.16.1)"
+        type: string
+        required: true
+      registry:
+        description: "Target container registry repository (defaults to ghcr.io/<repository>)"
+        type: string
+        required: false
+        default: ""
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  publish-oci:
+    name: Publish OCI ${{ matrix.arch }}
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { arch: x86_64, runner: ubuntu-24.04 }
+          - { arch: aarch64, runner: ubuntu-24.04-arm }
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        with:
+          name: release-linux-${{ matrix.arch }}
+          path: dist/linux
+
+      - name: Install Flatpak and Skopeo
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends flatpak flatpak-builder librsvg2-common skopeo
+          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+
+      - name: Add Flathub Remote
+        run: flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+      - name: Publish Flatpak OCI layout to GHCR
+        env:
+          RELEASE_VERSION: ${{ inputs.version }}
+          ARCH: ${{ matrix.arch }}
+          REGISTRY: ${{ inputs.registry || format('ghcr.io/{0}', github.repository) }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          shopt -s nullglob
+          tarballs=()
+          for f in dist/linux/*-"${RELEASE_VERSION}"-linux-"${ARCH}".tar.gz; do
+            case "${f##*/}" in *-cli-*|*-server-*) ;; *) tarballs+=("$f") ;; esac
+          done
+          if [ "${#tarballs[@]}" -ne 1 ]; then
+            echo "::error::expected one app tarball for ${RELEASE_VERSION} in release-linux-${ARCH}, found ${#tarballs[@]}: ${tarballs[*]}"
+            exit 1
+          fi
+          tarball="${tarballs[0]}"
+          if [ -x packaging/linux/flatpak-oci.sh ]; then
+            packaging/linux/flatpak-oci.sh --push "$tarball"
+          else
+            echo "::warning::packaging/linux/flatpak-oci.sh not found or not executable"
+          fi
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e5473b6..b071975 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -555,6 +555,9 @@ jobs:
     name: Flatpak ${{ matrix.arch }}
     needs: [version, linux]
     runs-on: ${{ matrix.runner }}
+    permissions:
+      contents: read
+      packages: write
     strategy:
       fail-fast: false
       matrix:
@@ -619,7 +622,7 @@ jobs:
       - name: Install flatpak-builder
         run: |
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends flatpak flatpak-builder librsvg2-common
+          sudo apt-get install -y --no-install-recommends flatpak flatpak-builder librsvg2-common skopeo
           sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
       - name: Build the Flatpak bundle
         env:
@@ -640,6 +643,17 @@ jobs:
           fi
           tarball="${tarballs[0]}"
           packaging/linux/flatpak-bundle.sh "$tarball"
+      - name: Publish Flatpak OCI layout to GHCR
+        if: github.event_name != 'pull_request'
+        env:
+          RELEASE_VERSION: ${{ needs.version.outputs.version }}
+          ARCH: ${{ matrix.arch }}
+          REGISTRY: ghcr.io/${{ github.repository }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          if [ -x packaging/linux/flatpak-oci.sh ]; then
+            packaging/linux/flatpak-oci.sh --push "$tarball"
+          fi
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
           name: release-flatpak-${{ matrix.arch }}