From a16500904cd0022a6ac2d4dbfa18156994b409cd Mon Sep 17 00:00:00 2001 From: Steev Date: Fri, 27 Dec 2024 04:01:25 +0100 Subject: [PATCH 1/2] .gitea/workflows/test-release.yml aktualisiert --- .gitea/workflows/test-release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/test-release.yml b/.gitea/workflows/test-release.yml index a29bbe4..652cb8c 100644 --- a/.gitea/workflows/test-release.yml +++ b/.gitea/workflows/test-release.yml @@ -37,12 +37,16 @@ jobs: - name: Build with Maven run: mvn clean package - # Changelog aus Commit-Nachrichten generieren + # Prüfen, ob Tags vorhanden sind und Changelog erstellen - name: Generate Changelog from Commits id: changelog run: | - # Changelog aus den Commits seit der letzten Version generieren - CHANGES=$(git log $(git describe --tags --abbrev=0)..HEAD --oneline --no-merges) + # Prüfen, ob ein Tag vorhanden ist + LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") + echo "Last Tag: $LAST_TAG" + + # Changelog aus den Commits seit dem letzten Tag erstellen + CHANGES=$(git log $LAST_TAG..HEAD --oneline --no-merges) echo "CHANGES=$CHANGES" >> $GITHUB_ENV echo "$CHANGES" @@ -69,4 +73,4 @@ jobs: prerelease: true body: | ## Changelog - ${{ steps.changelog.outputs.changes }} + ${{ steps.changelog.outputs.CHANGES }} -- 2.47.2 From ffcdcabf8af4041c5f79c4f69d66053db70c96dd Mon Sep 17 00:00:00 2001 From: Steev Date: Fri, 27 Dec 2024 04:02:16 +0100 Subject: [PATCH 2/2] .gitea/workflows/test-release.yml aktualisiert --- .gitea/workflows/test-release.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/test-release.yml b/.gitea/workflows/test-release.yml index 652cb8c..8022f19 100644 --- a/.gitea/workflows/test-release.yml +++ b/.gitea/workflows/test-release.yml @@ -1,12 +1,14 @@ name: Build and Release Minecraft Plugin on: - push: + pull_request: + types: [closed] branches: - - testing + - Testing jobs: build-and-release: + runs-on: self-hosted steps: # Repository auschecken @@ -37,18 +39,14 @@ jobs: - name: Build with Maven run: mvn clean package - # Prüfen, ob Tags vorhanden sind und Changelog erstellen - - name: Generate Changelog from Commits - id: changelog + # PR Commit-Nachrichten auslesen + - name: Get PR Commit Messages + id: pr_commits run: | - # Prüfen, ob ein Tag vorhanden ist - LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") - echo "Last Tag: $LAST_TAG" - - # Changelog aus den Commits seit dem letzten Tag erstellen - CHANGES=$(git log $LAST_TAG..HEAD --oneline --no-merges) - echo "CHANGES=$CHANGES" >> $GITHUB_ENV - echo "$CHANGES" + # PR-Commits abrufen + PR_COMMITS=$(git log --format=%s origin/${{ github.event.pull_request.base.ref }}..${{ github.sha }} --oneline) + echo "PR_COMMITS=$PR_COMMITS" >> $GITHUB_ENV + echo "$PR_COMMITS" # JAR-Datei umbenennen - name: Rename JAR File @@ -73,4 +71,4 @@ jobs: prerelease: true body: | ## Changelog - ${{ steps.changelog.outputs.CHANGES }} + ${{ env.PR_COMMITS }} -- 2.47.2