From 70d6658ca4a4eb79a2600bd1939a3e2328109301 Mon Sep 17 00:00:00 2001
From: Patrick Decat <pdecat@gmail.com>
Date: Mon, 10 Mar 2025 11:51:47 +0100
Subject: [PATCH 1/2] ci: publish git tags to Github (resolves #444)

---
 .changeset/automatic-tags-publish.md      | 5 +++++
 .github/workflows/marketplace-publish.yml | 9 +++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 .changeset/automatic-tags-publish.md

diff --git a/.changeset/automatic-tags-publish.md b/.changeset/automatic-tags-publish.md
new file mode 100644
index 0000000000..a3ff07fb4c
--- /dev/null
+++ b/.changeset/automatic-tags-publish.md
@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Update GitHub Actions workflow to automatically create and push git tags during release
diff --git a/.github/workflows/marketplace-publish.yml b/.github/workflows/marketplace-publish.yml
index c6fd66b1b3..7d71b2f86f 100644
--- a/.github/workflows/marketplace-publish.yml
+++ b/.github/workflows/marketplace-publish.yml
@@ -10,6 +10,8 @@ env:
 jobs:
   publish-extension:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write  # Required for pushing tags
     if: >
         ( github.event_name == 'pull_request' &&
         github.event.pull_request.base.ref == 'main' &&
@@ -51,3 +53,10 @@ jobs:
 
           npm run publish:marketplace
           echo "Successfully published version $current_package_version to VS Code Marketplace"
+      
+      - name: Create and Push Git Tag
+        run: |
+          current_package_version=$(node -p "require('./package.json').version")
+          git tag -a "v${current_package_version}" -m "Release v${current_package_version}"
+          git push origin "v${current_package_version}"
+          echo "Successfully created and pushed git tag v${current_package_version}"

From f99fc59460f1049f53ac82b809d9b11dc9d2663f Mon Sep 17 00:00:00 2001
From: Patrick Decat <pdecat@gmail.com>
Date: Mon, 10 Mar 2025 15:29:14 +0100
Subject: [PATCH 2/2] ci: tag after packaging but before publishing

---
 .github/workflows/marketplace-publish.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/marketplace-publish.yml b/.github/workflows/marketplace-publish.yml
index 7d71b2f86f..4ecd2af7a2 100644
--- a/.github/workflows/marketplace-publish.yml
+++ b/.github/workflows/marketplace-publish.yml
@@ -25,24 +25,24 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
+
       - run: |
           git config user.name github-actions
           git config user.email github-actions@github.com
+
       - name: Install Dependencies
         run: |
           npm install -g vsce ovsx
           npm run install:ci
+
       - name: Create .env file
         run: |
           echo "# PostHog API Keys for telemetry" > .env
           echo "POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
-      - name: Package and Publish Extension
-        env:
-          VSCE_PAT: ${{ secrets.VSCE_PAT }}
-          OVSX_PAT: ${{ secrets.OVSX_PAT }}
+
+      - name: Package Extension
         run: |
           current_package_version=$(node -p "require('./package.json').version")
-
           npm run vsix
           package=$(unzip -l bin/roo-cline-${current_package_version}.vsix)
           echo "$package"
@@ -51,12 +51,18 @@ jobs:
           echo "$package" | grep -q "extension/node_modules/@vscode/codicons/dist/codicon.ttf" || exit 1
           echo "$package" | grep -q ".env" || exit 1
 
-          npm run publish:marketplace
-          echo "Successfully published version $current_package_version to VS Code Marketplace"
-      
       - name: Create and Push Git Tag
         run: |
           current_package_version=$(node -p "require('./package.json').version")
           git tag -a "v${current_package_version}" -m "Release v${current_package_version}"
           git push origin "v${current_package_version}"
           echo "Successfully created and pushed git tag v${current_package_version}"
+
+      - name: Publish Extension
+        env:
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}
+          OVSX_PAT: ${{ secrets.OVSX_PAT }}
+        run: |
+          current_package_version=$(node -p "require('./package.json').version")
+          npm run publish:marketplace
+          echo "Successfully published version $current_package_version to VS Code Marketplace"