fix(flatpak): regenerate summary in publish jobs, add flatpak tooling + gpg key
This commit is contained in:
@@ -499,6 +499,16 @@ jobs:
|
|||||||
needs: build-flatpak
|
needs: build-flatpak
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: Install Flatpak tooling
|
||||||
|
run: |
|
||||||
|
sudo apt-get update -qq
|
||||||
|
sudo apt-get install -y --no-install-recommends flatpak
|
||||||
|
|
||||||
|
- name: Import Flatpak signing key
|
||||||
|
run: |
|
||||||
|
echo "${{ secrets.FLATPAK_GPG_PRIVATE_KEY }}" | gpg --batch --import
|
||||||
|
echo "FLATPAK_GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/{print $10; exit}')" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Download OSTree repo artifact
|
- name: Download OSTree repo artifact
|
||||||
uses: actions/download-artifact@v4.1.3
|
uses: actions/download-artifact@v4.1.3
|
||||||
with:
|
with:
|
||||||
@@ -518,7 +528,9 @@ jobs:
|
|||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
# Copy the new OSTree build into the repo
|
# Copy the new OSTree build into the repo
|
||||||
rsync -a ../flatpak-ostree-repo/ ./
|
rsync -a ../flatpak-ostree-repo/ ./
|
||||||
# Stage all changes (new/updated refs in OSTree)
|
# Regenerate summary with all branches
|
||||||
|
flatpak build-update-repo --gpg-sign="$FLATPAK_GPG_KEY_ID" .
|
||||||
|
# Stage all changes (new/updated refs, summary, objects in OSTree)
|
||||||
git add -A
|
git add -A
|
||||||
if git diff --cached --quiet; then
|
if git diff --cached --quiet; then
|
||||||
echo "No changes to commit"
|
echo "No changes to commit"
|
||||||
|
|||||||
@@ -589,6 +589,16 @@ jobs:
|
|||||||
needs: build-flatpak
|
needs: build-flatpak
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: Install Flatpak tooling
|
||||||
|
run: |
|
||||||
|
sudo apt-get update -qq
|
||||||
|
sudo apt-get install -y --no-install-recommends flatpak
|
||||||
|
|
||||||
|
- name: Import Flatpak signing key
|
||||||
|
run: |
|
||||||
|
echo "${{ secrets.FLATPAK_GPG_PRIVATE_KEY }}" | gpg --batch --import
|
||||||
|
echo "FLATPAK_GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/{print $10; exit}')" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Download OSTree repo artifact
|
- name: Download OSTree repo artifact
|
||||||
uses: actions/download-artifact@v4.1.3
|
uses: actions/download-artifact@v4.1.3
|
||||||
with:
|
with:
|
||||||
@@ -607,6 +617,8 @@ jobs:
|
|||||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
rsync -a ../flatpak-ostree-repo/ ./
|
rsync -a ../flatpak-ostree-repo/ ./
|
||||||
|
# Regenerate summary with all branches (not just the one just built)
|
||||||
|
flatpak build-update-repo --gpg-sign="$FLATPAK_GPG_KEY_ID" .
|
||||||
git add -A
|
git add -A
|
||||||
if git diff --cached --quiet; then
|
if git diff --cached --quiet; then
|
||||||
echo "No changes to commit"
|
echo "No changes to commit"
|
||||||
|
|||||||
Reference in New Issue
Block a user