From 2b6cc8abd8c5c35d1bd91d5c48451bff0e15e828 Mon Sep 17 00:00:00 2001
From: replydev <commoncargo@tutanota.com>
Date: Fri, 16 Feb 2024 01:01:53 +0100
Subject: [PATCH] fix: latest CD fixes

---
 .github/workflows/deploy.yml  | 16 ++++++++--------
 .github/workflows/release.yml |  1 +
 .releaserc                    |  5 +++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6a3caa2a..c4ed2a84 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,8 +2,8 @@ name: Deploy
 on:
    workflow_dispatch:
     inputs:
-      tag:
-        description: 'Tag name used to deploy the version'
+      new_version:
+        description: New version to deploy
         required: true
         type: string
 
@@ -95,7 +95,7 @@ jobs:
       - name: Build archive
         shell: bash
         env:
-          TAG: ${{ inputs.tag }}
+          NEW_VERSION: ${{ inputs.new_version }}
         run: |
           set -ex
 
@@ -110,7 +110,7 @@ jobs:
               if [[ "$platform" == *"win"* ]]; then
                   exe=".exe"
               fi
-              pkgname=$PROJECT_NAME-$TAG-$platform
+              pkgname=$PROJECT_NAME-$NEW_VERSION-$platform
               mkdir tmp/$pkgname
               # cp LICENSE README.md tmp/$pkgname
               mv cotp-$platform/$BIN_NAME$exe tmp/$pkgname
@@ -129,7 +129,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: dist/*
           file_glob: true
-          tag: ${{ inputs.tag }}
+          tag: v${{ inputs.new_version }}
           overwrite: true
 
   publish_on_cargo_crates:
@@ -167,7 +167,7 @@ jobs:
       - name: Generate PKGBUILDs
         shell: bash
         run: |
-          python ci/build_pkgbuild.py ${{ inputs.tag }}
+          python ci/build_pkgbuild.py ${{ inputs.new_version }}
           cat ./ci/cotp/PKGBUILD
           cat ./ci/cotp-bin/PKGBUILD
 
@@ -179,7 +179,7 @@ jobs:
           commit_username: ${{ secrets.AUR_USERNAME }}
           commit_email: ${{ secrets.AUR_EMAIL }}
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: Update cotp package to version ${{ inputs.tag }}
+          commit_message: Update cotp package to version ${{ inputs.new_version }}
           ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
 
       - name: "Clean repo dir"
@@ -195,5 +195,5 @@ jobs:
           commit_username: ${{ secrets.AUR_USERNAME }}
           commit_email: ${{ secrets.AUR_EMAIL }}
           ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: Update cotp-bin package to version ${{ inputs.tag }}
+          commit_message: Update cotp-bin package to version ${{ inputs.new_version }}
           ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b23d04f0..b73c796e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,6 +25,7 @@ jobs:
       - name: Install Semantic Release globally
         run: npm install -g semantic-release @semantic-release/git @semantic-release/exec
 
+      # Semantic Release configuration executes gh CLI which triggers the deploy workflow
       - name: Release with semantic versioning
         run: npx semantic-release
         env:
diff --git a/.releaserc b/.releaserc
index a95188c7..638b883f 100644
--- a/.releaserc
+++ b/.releaserc
@@ -3,17 +3,18 @@
 	"plugins": [
 		"@semantic-release/commit-analyzer",
 		"@semantic-release/release-notes-generator",
+		"@semantic-release/changelog",
 		[
 			"@semantic-release/exec",
 			{
 				"prepareCmd": "ci/write_cargo_version.sh ${nextRelease.version}",
-        "successCmd": "gh workflow run Deploy -f tag=${nextRelease.version}"
+				"successCmd": "gh workflow run Deploy -f new_version=${nextRelease.version}"
 			}
 		],
 		[
 			"@semantic-release/git",
 			{
-				"assets": ["Cargo.toml", "Cargo.lock"]
+				"assets": ["Cargo.toml", "Cargo.lock", "CHANGELOG.md"]
 			}
 		],
 		"@semantic-release/github"