From 2590a5ece1aa2b018c6ab9dff5b9b4816be52901 Mon Sep 17 00:00:00 2001
From: Ruud Senden <8635138+rsenden@users.noreply.github.com>
Date: Tue, 13 Aug 2024 14:16:16 +0200
Subject: [PATCH] ci: Rename branch main->v2.x for consistency with v1.x

---
 .github/workflows/ci.yml      | 12 ++++++------
 .gitignore                    |  1 +
 .release-please-manifest.json |  3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 .release-please-manifest.json

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3de154b732..d2efcc6143 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,12 +25,12 @@ jobs:
 
       - name: PROD - Prepare GitHub release
         id: create_prod_release
-        uses: GoogleCloudPlatform/release-please-action@v3
+        uses: googleapis/release-please-action@v4
         if: github.ref == 'refs/heads/v2.x'
         with:
-          command: github-release
+          skip-github-pull-request: true
+          target-branch: v2.x
           release-type: simple
-          package-name: ${{ github.event.repository.name }}  
           
       - name: PROD - Define release info
         if: steps.create_prod_release.outputs.release_created
@@ -266,11 +266,11 @@ jobs:
           
       - name: PROD - Prepare release PR
         if: github.ref == 'refs/heads/v2.x'
-        uses: GoogleCloudPlatform/release-please-action@v3
+        uses: googleapis/release-please-action@v4
         with:
-          command: release-pr
+          skip-github-release: true
           release-type: simple
-          package-name: ${{ github.event.repository.name }}
+          target-branch: v2.x
           
       - name: DEV - Prepare GitHub release 
         if: needs.build.outputs.do_dev_release
diff --git a/.gitignore b/.gitignore
index 42bab027ab..d782ae2945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.zip
 NcdReportConfig.yml
 MspReportConfig.yml
+!.release-please-manifest.json
 
 # Files generated by native-image when run locally
 /fcli
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
new file mode 100644
index 0000000000..a549f59d00
--- /dev/null
+++ b/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "2.4.0"
+}