From 1919e14032e4b5c5aca27939e47a81acae199794 Mon Sep 17 00:00:00 2001 From: rob thijssen Date: Sun, 26 Apr 2026 14:54:48 +0300 Subject: [PATCH] fix(ci): move rpmmacros to template file The heredoc with column-0 lines inside a YAML block scalar may confuse Gitea's workflow parser. Move rpmmacros content to rpm/rpmmacros as a template with sed substitution. Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitea/workflows/build-release.yml | 5 +---- rpm/rpmmacros | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 rpm/rpmmacros diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml index 45407e4..ba8587d 100644 --- a/.gitea/workflows/build-release.yml +++ b/.gitea/workflows/build-release.yml @@ -136,10 +136,7 @@ jobs: - name: Import signing key run: | echo "${{ secrets.RPM_SIGNING_KEY }}" | gpg --batch --import - cat > ~/.rpmmacros << 'RPMMACROS' -%_gpg_name ${{ secrets.RPM_SIGNING_KEY_ID }} -%__gpg_sign_cmd %{__gpg} --batch --no-armor --no-tty --pinentry-mode loopback --passphrase '' %{?_gpg_digest_algo:--digest-algo %{_gpg_digest_algo}} --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename} --digest-algo sha256 %{__plaintext_filename} -RPMMACROS + sed "s/@GPG_NAME@/${{ secrets.RPM_SIGNING_KEY_ID }}/" rpm/rpmmacros > ~/.rpmmacros - name: Sign and publish run: ./script/publish-repo.sh rpms/ diff --git a/rpm/rpmmacros b/rpm/rpmmacros new file mode 100644 index 0000000..6b23b9a --- /dev/null +++ b/rpm/rpmmacros @@ -0,0 +1,2 @@ +%_gpg_name @GPG_NAME@ +%__gpg_sign_cmd %{__gpg} --batch --no-armor --no-tty --pinentry-mode loopback --passphrase '' %{?_gpg_digest_algo:--digest-algo %{_gpg_digest_algo}} --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename} --digest-algo sha256 %{__plaintext_filename}