From 8c7a41172b3ae4845894f51f597e9d9a3406c444 Mon Sep 17 00:00:00 2001
From: Andrea Amorosi <dreamorosi@gmail.com>
Date: Thu, 24 Jul 2025 11:04:57 +0200
Subject: [PATCH] ci: remove lerna version

---
 .github/workflows/make-release.yml |  2 +-
 .github/workflows/make-version.yml | 37 +++++++++++++++++-------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index bbe48ad833..f231081ce0 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Set release version
         id: set-release-version
         run: |
-          VERSION=$(cat lerna.json | jq .version -r)
+          VERSION=$(cat packages/commons/package.json | jq .version -r)
           echo RELEASE_VERSION="$VERSION" >> "$GITHUB_OUTPUT"
   
   # This job creates a new git tag using the released version (v1.18.1)
diff --git a/.github/workflows/make-version.yml b/.github/workflows/make-version.yml
index 2d0b6856f4..cbb268a43e 100644
--- a/.github/workflows/make-version.yml
+++ b/.github/workflows/make-version.yml
@@ -1,7 +1,11 @@
 name: Make Version
 
 on:
-  workflow_dispatch: { }
+  workflow_dispatch:
+    inputs:
+      release-type:
+        description: 'Release type (major, minor, patch)'
+        required: false
 
 permissions:
   contents: read
@@ -14,39 +18,40 @@ jobs:
       contents: write
       pull-requests: write
     runs-on: ubuntu-latest
+    env:
+      NODE_VERSION: "22"
     outputs:
-      RELEASE_VERSION: ${{ steps.set-release-version.outputs.RELEASE_VERSION }}
+      RELEASE_VERSION: ${{ steps.version-n-changelog.outputs.new-version  }}
     steps:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         with:
           ref: ${{ github.ref }}
-          fetch-depth: 0 # fetch all history, commits and tags, lerna scans it to the last tag and looks at commits, we need all of it to determine the next version
-      - name: Setup NodeJS
+          fetch-depth: 0 # fetch all history, commits and tags, so we can determine the next version
+      - name: Setup Node.js
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version: "22"
+          node-version: ${{ env.NODE_VERSION }}
           cache: "npm"
       - name: Setup dependencies
-        uses: aws-powertools/actions/.github/actions/cached-node-modules@29979bc5339bf54f76a11ac36ff67701986bb0f0
-      - name: Version
-        id: bump-version
-        run: npx lerna version --conventional-commits --force-publish --no-git-tag-version --no-push --no-commit-hooks --yes
+        uses: aws-powertools/actions/.github/actions/cached-node-modules@b8e12f37991bb03672113b65cae09d52d494bbef # v1.0.0
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: Version and changelog
+        id: version-n-changelog
+        uses: aws-powertools/actions/.github/actions/version-n-changelog@b8e12f37991bb03672113b65cae09d52d494bbef # v1.0.0
+        with:
+          release-type: ${{ github.event.inputs.release-type }}
       - name: Update user agent version
         run: |
-          VERSION=$(cat lerna.json | jq .version -r)
+          VERSION=$(${{ steps.version-n-changelog.outputs.new-version }})
           echo -e "// this file is auto generated, do not modify\nexport const PT_VERSION = '$VERSION';" > packages/commons/src/version.ts
       - name: Stage changes
         run: git add .
-      - name: Set release version
-        id: set-release-version
-        run: |
-          VERSION=$(cat lerna.json | jq .version -r)
-          echo RELEASE_VERSION="$VERSION" >> "$GITHUB_OUTPUT"
       - name: Create PR
         id: create-pr
         uses: ./.github/actions/create-pr
         with:
           temp_branch_prefix: "ci-bump"
-          pull_request_title: "chore(ci): bump version to ${{ steps.set-release-version.outputs.RELEASE_VERSION }}"
+          pull_request_title: "chore(ci): bump version to ${{ steps.version-n-changelog.outputs.new-version  }}"
           github_token: ${{ secrets.GITHUB_TOKEN }}