4949 path : |
5050 ~/.local/share/flatpak
5151 .flatpak-builder
52- key : flatpak-${{ runner.os }}-${{ hashFiles('Cargo.lock', 'Frontend/package-lock.json', 'flathub/io.github.jordonbc .OpenVCS.yml') }}
52+ key : flatpak-${{ runner.os }}-${{ hashFiles('Cargo.lock', 'Frontend/package-lock.json', 'flathub/app.openvcs .OpenVCS.yml') }}
5353 restore-keys : flatpak-${{ runner.os }}-
5454
5555 - name : Compute version tag
@@ -104,7 +104,7 @@ jobs:
104104
105105 # ---------- Flatpak (Linux only; artifact) ----------
106106 - name : Install Flatpak tooling
107- if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/io.github.jordonbc .OpenVCS.yml') != ''
107+ if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/app.openvcs .OpenVCS.yml') != ''
108108 shell : bash
109109 run : |
110110 set -euxo pipefail
@@ -121,26 +121,26 @@ jobs:
121121 || flatpak install --user -y flathub org.freedesktop.Sdk.Extension.node24//24.08
122122
123123 - name : Verify Flatpak manifest exists
124- if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/io.github.jordonbc .OpenVCS.yml') != ''
124+ if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/app.openvcs .OpenVCS.yml') != ''
125125 shell : bash
126126 run : |
127127 set -euxo pipefail
128128 ls -la flathub
129- test -f flathub/io.github.jordonbc .OpenVCS.yml
129+ test -f flathub/app.openvcs .OpenVCS.yml
130130
131131 - name : Build Flatpak bundle
132- if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/io.github.jordonbc .OpenVCS.yml') != ''
132+ if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/app.openvcs .OpenVCS.yml') != ''
133133 shell : bash
134134 run : |
135135 set -euxo pipefail
136136 # Stable production builds should report the plain package version (not git metadata).
137137 # flatpak-builder sandboxes don't inherit host env vars, so inject via manifest.
138- yq eval '(.modules[] | select(.name == "openvcs-backend") | ."build-options".env.OPENVCS_OFFICIAL_RELEASE) = "1"' -i flathub/io.github.jordonbc .OpenVCS.yml
139- flatpak-builder --user --force-clean --repo=repo build-flatpak flathub/io.github.jordonbc .OpenVCS.yml
140- flatpak build-bundle repo OpenVCS.flatpak io.github.jordonbc .OpenVCS
138+ yq eval '(.modules[] | select(.name == "openvcs-backend") | ."build-options".env.OPENVCS_OFFICIAL_RELEASE) = "1"' -i flathub/app.openvcs .OpenVCS.yml
139+ flatpak-builder --user --force-clean --repo=repo build-flatpak flathub/app.openvcs .OpenVCS.yml
140+ flatpak build-bundle repo OpenVCS.flatpak app.openvcs .OpenVCS
141141
142142 - name : Upload Flatpak bundle (artifact)
143- if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/io.github.jordonbc .OpenVCS.yml') != ''
143+ if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/app.openvcs .OpenVCS.yml') != ''
144144 uses : actions/upload-artifact@v7
145145 with :
146146 name : OpenVCS-flatpak-stable
@@ -193,21 +193,21 @@ jobs:
193193 # bundles: '' # e.g. 'deb,appimage,msi,nsis' if you want to restrict output
194194
195195 - name : Upload Flatpak bundle to GitHub Release
196- if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/io.github.jordonbc .OpenVCS.yml') != ''
196+ if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/app.openvcs .OpenVCS.yml') != ''
197197 env :
198198 GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
199199 run : gh release upload "${{ steps.version.outputs.tag }}" OpenVCS.flatpak --clobber
200200
201201 # ---------- Update Flathub repo for next PR ----------
202202 - name : Install flatpak generator tools
203- if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/io.github.jordonbc .OpenVCS.yml') != ''
203+ if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/app.openvcs .OpenVCS.yml') != ''
204204 shell : bash
205205 run : |
206206 set -euxo pipefail
207207 pip install flatpak-cargo-generator flatpak-node-generator
208208
209209 - name : Regenerate Flatpak vendor sources
210- if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/io.github.jordonbc .OpenVCS.yml') != ''
210+ if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/app.openvcs .OpenVCS.yml') != ''
211211 shell : bash
212212 run : |
213213 set -euxo pipefail
@@ -219,7 +219,7 @@ jobs:
219219 echo "Vendor sources regenerated."
220220
221221 - name : Update Flathub manifest and metadata
222- if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/io.github.jordonbc .OpenVCS.yml') != ''
222+ if : matrix.platform == 'ubuntu-24.04' && env.OPENVCS_ENABLE_FLATPAK == '1' && hashFiles('flathub/app.openvcs .OpenVCS.yml') != ''
223223 shell : bash
224224 run : |
225225 set -euxo pipefail
@@ -234,6 +234,6 @@ jobs:
234234 set +x # avoid leaking the PAT in logs
235235 git remote set-url origin "https://x-access-token:${{ secrets.FLATHUB_REPO_PAT }}@github.com/Open-VCS/flathub.git"
236236 set -x
237- git add io.github.jordonbc. OpenVCS.yml io.github.jordonbc .OpenVCS.metainfo.xml cargo-sources.json npm-sources-frontend.json
237+ git add app.openvcs. OpenVCS.yml app.openvcs .OpenVCS.metainfo.xml cargo-sources.json npm-sources-frontend.json
238238 git diff --staged --quiet || git commit -m "chore: bump to openvcs-v${{ steps.version.outputs.version }}"
239239 git push
0 commit comments