From 5feefd7832a1fcf092be0773e9eac74b3c1f0df6 Mon Sep 17 00:00:00 2001
From: rix <rix@rix>
Date: Mon, 20 May 2024 12:38:38 +0200
Subject: [PATCH] v.0.1.5 - Improved release flow

---
 .github/Changelog.md                           | 18 +-----------------
 .github/workflows/CreateRelease.yml            | 13 ++++++++++---
 .github/workflows/UpdateOnBaseImageChange.yml  |  2 +-
 budgeteer/providers/version.py                 |  2 +-
 .../web_interface/vuejs_frontend/package.json  |  2 +-
 5 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.github/Changelog.md b/.github/Changelog.md
index 47c6384..d94a56e 100644
--- a/.github/Changelog.md
+++ b/.github/Changelog.md
@@ -12,20 +12,4 @@
 - Zukünftige Restbudgets sind nicht im Kopfbereich aufrufbar
 
 
-### Changelog BudgeTeer:
-
-#### v.0.1.2
-- Fehlerbehebung bei Aktivierung von Basic Auth
-- Die Gültigkeit von künftigen Budgets wird beim Anzeigen und Berechnen dieser beachtet
-- Budgets können monatlich als gebucht markiert werden
-
-#### v.0.1.1
-- Fehlerkorrektur beim Hinzufügen neuer Konten, Transaktionen und Budgets
-- Budgets können umbenannt und gelöscht werden
-
-#### v.0.1.0
-- Kontostände, Budgets und offene Transaktionen werden beim Sperren automatisch gespeichert
-- Budgeteintrag auf Gültigkeitszeitraum prüfen
-- Datepicker implementiert (für Gültigkeitszeitraum der Budgets)
-- Kontostände in die Kopfzeile verschoben
-- Schaltfläche "Speichern" beim Löschen von Budgets und offenen Transaktionen anzeigen
+### Changelog:
diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index 1459a60..486ccd9 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -3,8 +3,7 @@ name: Release Artifacts
 on:
   push:
     paths-ignore:
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.github/workflows/**'
+      - '.github/**'
       - 'docker/**'
     branches:
       - main
@@ -101,6 +100,14 @@ jobs:
       - name: Get Version
         run: echo "version=$(python budgeteer/providers/version.py)" >>$GITHUB_OUTPUT
         id: version
+      - name: Generate commit changelog
+        id: changelog
+        uses: metcalfc/changelog-generator@v4.3.1 # this requires at least one release tag in the repo!
+        with:
+          myToken: ${{ secrets.GITHUB_TOKEN }}
+      - name: Append commit changelog
+        run: |
+          echo -e "\n${{ steps.changelog.outputs.changelog }}" >> .github/Changelog.md
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
@@ -113,4 +120,4 @@ jobs:
           python -m twine upload ./artifact-wheel/* -u __token__ -p ${{ secrets.PYPI_TOKEN }}
       - name: Trigger Docker Image build
         run: |
-          curl -XPOST -u "${{ secrets.CR_USER }}:${{secrets.CR_PAT}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/rix1337/BudgeTeer/actions/workflows/BuildImage.yml/dispatches --data '{"ref": "main", "inputs": {"version": "${{ steps.version.outputs.version }}"}"}'
+          curl -XPOST -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/rix1337/BudgeTeer/actions/workflows/BuildImage.yml/dispatches --data '{"ref": "main", "inputs": {"version": "${{ steps.version.outputs.version }}"}"}'
diff --git a/.github/workflows/UpdateOnBaseImageChange.yml b/.github/workflows/UpdateOnBaseImageChange.yml
index 2f84e5b..48c2d86 100644
--- a/.github/workflows/UpdateOnBaseImageChange.yml
+++ b/.github/workflows/UpdateOnBaseImageChange.yml
@@ -19,5 +19,5 @@ jobs:
           image: ${{ env.IMAGE }}
       - name: Trigger Docker Image build
         run: |
-          curl -XPOST -u "${{ secrets.CR_USER }}:${{secrets.CR_PAT}}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/rix1337/Budgeteer/actions/workflows/BuildImage.yml/dispatches --data '{"ref": "main"}'
+          curl -XPOST -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/rix1337/BudgeTeer/actions/workflows/BuildImage.yml/dispatches --data '{"ref": "main"}'
         if: steps.baseupdatecheck.outputs.needs-updating == 'true'
diff --git a/budgeteer/providers/version.py b/budgeteer/providers/version.py
index bb10d6a..9b1ea57 100644
--- a/budgeteer/providers/version.py
+++ b/budgeteer/providers/version.py
@@ -9,7 +9,7 @@
 
 
 def get_version():
-    return "0.1.4"
+    return "0.1.5"
 
 
 def create_version_file():
diff --git a/budgeteer/web_interface/vuejs_frontend/package.json b/budgeteer/web_interface/vuejs_frontend/package.json
index 269a4dd..1fc00dc 100644
--- a/budgeteer/web_interface/vuejs_frontend/package.json
+++ b/budgeteer/web_interface/vuejs_frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budgeteer-web",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "dev": "vite",
     "build": "vite build",