diff --git a/.github/workflows/nightly-artifacts.yml b/.github/workflows/nightly-artifacts.yml index cfbcba0..3103a96 100644 --- a/.github/workflows/nightly-artifacts.yml +++ b/.github/workflows/nightly-artifacts.yml @@ -499,6 +499,16 @@ jobs: needs: build-flatpak 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 uses: actions/download-artifact@v4.1.3 with: @@ -518,7 +528,9 @@ jobs: git config user.name "github-actions[bot]" # Copy the new OSTree build into the 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 if git diff --cached --quiet; then echo "No changes to commit" diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml index 8675c5c..bf2d469 100644 --- a/.github/workflows/tagged-release.yml +++ b/.github/workflows/tagged-release.yml @@ -589,6 +589,16 @@ jobs: needs: build-flatpak 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 uses: actions/download-artifact@v4.1.3 with: @@ -607,6 +617,8 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.name "github-actions[bot]" 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 if git diff --cached --quiet; then echo "No changes to commit"