From 3676bedbb9e2144b87c19bbe7d51ebd70ca85e6e Mon Sep 17 00:00:00 2001
From: Telan <13066272+TheElan@users.noreply.github.com>
Date: Sun, 21 Nov 2021 20:42:00 +0200
Subject: [PATCH] ci: fix repo_token and tag expansion

---
 .github/workflows/release-packages.yml | 6 +++---
 .github/workflows/release.yml          | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml
index d3201a5..d117fc5 100644
--- a/.github/workflows/release-packages.yml
+++ b/.github/workflows/release-packages.yml
@@ -64,10 +64,10 @@ jobs:
       - name: Release under current tag
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}-packages"
-          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ env.RELEASE_VERSION }}-packages"
           prerelease: false
-          title: "${{ env.RELEASE_VERSION }}: starter and migration packages"
+          title: "${{ env.RELEASE_VERSION }} starter and migration packages"
           files: packages/*
 
       - name: Update latest tag
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1765779..05af834 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Set release version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
       - name: Set up JDK 8
         uses: actions/setup-java@v2
         with:
@@ -36,9 +39,9 @@ jobs:
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${GITHUB_REF##*/}"
+          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
           prerelease: false
-          title: "${GITHUB_REF##*/}"
+          title: "${{ env.RELEASE_VERSION }}"
           files: build/libs/*.jar
 
       - name: Update latest tag