From 466ca34619e33d21e3ee4e4ecb82fc40e322a214 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sun, 27 Jul 2025 13:27:49 +0200
Subject: [PATCH 1/3] fix: action parameters are not granted access to secrets

---
 action.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/action.yml b/action.yml
index 7e09788..63ab2f0 100644
--- a/action.yml
+++ b/action.yml
@@ -6,21 +6,21 @@ description: |
 inputs:
   url:
     description: 'URL of the Forgejo instance'
-    default: '${{ env.GITHUB_SERVER_URL }}'
+    default: '${{ env.FORGEJO_SERVER_URL }}'
   repo:
     description: 'owner/project relative to the URL'
-    default: '${{ github.repository }}'
+    default: '${{ forge.repository }}'
   tag:
     description: 'Tag of the release'
-    default: '${{ github.ref_name }}'
+    default: '${{ forge.ref_name }}'
   title:
     description: 'Title of the release (defaults to tag)'
   sha:
     description: 'SHA of the release'
-    default: '${{ github.sha }}'
+    default: '${{ forge.sha }}'
   token:
     description: 'Forgejo application token'
-    default: '${{ secrets.GITHUB_TOKEN }}'
+    default: '${{ forge.token }}'
   release-dir:
     description: 'Directory in whichs release assets are uploaded or downloaded'
     required: true
@@ -57,7 +57,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - run: echo "${{ github.action_path }}" >> $GITHUB_PATH
+    - run: echo "${{ forge.action_path }}" >> $FORGEJO_PATH
       shell: bash
     - run: |
         export FORGEJO="${{ inputs.url }}"

From 63485695ff9710e98d30144c835692d1575b1ca9 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sun, 27 Jul 2025 13:39:41 +0200
Subject: [PATCH 2/3] fix: upgrade release notes assitant to agree with git

---
 forgejo-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forgejo-release.sh b/forgejo-release.sh
index 1216ded..85d56e0 100755
--- a/forgejo-release.sh
+++ b/forgejo-release.sh
@@ -19,7 +19,7 @@ if ${VERBOSE:-false}; then set -x; fi
 : ${RETRY:=1}
 : ${DELAY:=10}
 
-RELEASE_NOTES_ASSISTANT_VERSION=v1.3.3 # renovate: datasource=forgejo-releases depName=forgejo/release-notes-assistant registryUrl=https://code.forgejo.org
+RELEASE_NOTES_ASSISTANT_VERSION=v1.3.5 # renovate: datasource=forgejo-releases depName=forgejo/release-notes-assistant registryUrl=https://code.forgejo.org
 
 TAG_FILE="$TMP_DIR/tag$$.json"
 TAG_URL=$(echo "$TAG" | sed 's/\//%2F/g')

From d21db0da1a6a3d46390617c111ad84dd4c49a3aa Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sun, 27 Jul 2025 14:20:15 +0200
Subject: [PATCH 3/3] chore(ci): always show the runner and server logs

---
 .forgejo/workflows/integration.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml
index 50d4a3a..d1d67eb 100644
--- a/.forgejo/workflows/integration.yml
+++ b/.forgejo/workflows/integration.yml
@@ -61,5 +61,11 @@ jobs:
           export VERBOSE=true
           testdata/forgejo-release-test.sh test_run testuser otherrepo
 
-      - if: failure()
-        run: docker logs forgejo
+      - if: always()
+        name: '[RUNNER] and [FORGEJO] logs'
+        run: |
+          runner_logs="${{ steps.forgejo.outputs.runner-logs }}"
+          if test -f "$runner_logs"; then
+            sed -e 's/^/[RUNNER] /' < $runner_logs
+          fi
+          docker logs forgejo | sed -e 's/^/[FORGEJO] /'