From d3dd568e41c83bc51b102dea66287cf303370e2c Mon Sep 17 00:00:00 2001
From: zowe-robot <zowe.robot@gmail.com>
Date: Fri, 4 Aug 2023 14:53:46 +0000
Subject: [PATCH 1/2] v2.11.0

Signed-off-by: zowe-robot <zowe.robot@gmail.com>
---
 manifest.yaml         | 2 +-
 pluginDefinition.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.yaml b/manifest.yaml
index e6c2c52a..67b315cd 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -2,7 +2,7 @@
 name: editor
 id: org.zowe.editor
 # Without the v
-version: 2.10.0
+version: 2.11.0
 # Human readable component name
 title: Editor
 # Human readable component description
diff --git a/pluginDefinition.json b/pluginDefinition.json
index ac9a52e4..c49e5c5e 100644
--- a/pluginDefinition.json
+++ b/pluginDefinition.json
@@ -1,7 +1,7 @@
 {
   "identifier": "org.zowe.editor",
   "apiVersion": "2.0.0",
-  "pluginVersion": "2.10.0",
+  "pluginVersion": "2.11.0",
   "license": "EPL-2.0",
   "author": "Zowe",
   "homepage": "https://github.com/zowe/zlux-editor",

From f22cad15b28fa7e9168a3b8f994f663e31e67d3b Mon Sep 17 00:00:00 2001
From: syadav3 <syadav3@rocketsoftware.com>
Date: Wed, 9 Aug 2023 23:40:15 +0530
Subject: [PATCH 2/2] Added Merge Check for Changelog file

---
 .github/workflows/build_test.yml | 44 ++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 9561b960..c23fdf34 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -33,6 +33,50 @@ jobs:
           github-repo: ${{ github.repository }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
+  check_changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+            path: copy-repo
+            fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }}
+
+      - name: Get changed files
+        id: changed-files
+        run: |
+            cd copy-repo
+            if ${{ github.event_name == 'pull_request' }}; then
+                echo "changed_files=$(git diff --name-only -r HEAD^1 HEAD | xargs)" >> $GITHUB_OUTPUT
+            else
+                echo "changed_files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT
+            fi
+
+      - name: List changed files
+        id: set-flag
+        run: |
+            cd copy-repo
+            for file in ${{ steps.changed-files.outputs.changed_files }}; do
+                echo "$file was changed"
+                if [[ $file == "CHANGELOG.md" ]]
+                then
+                  echo "file-flag=true" >> $GITHUB_OUTPUT
+                  break;
+                else
+                  echo "file-flag=false" >> $GITHUB_OUTPUT
+                fi
+            done
+
+      - name: Check if CHANGELOG is Updated and Abort if not updated
+        if: steps.set-flag.outputs.file-flag != 'true'
+        run: |
+          echo "CHANGELOG.md not updated, please update CHANGELOG.md with the changes made in the pull request"
+          exit 1
+
+      - name: Remove copy-repo
+        if: always()
+        run: rm -r copy-repo
+
   build:
     runs-on: ubuntu-latest
     needs: check-permission