From dd1f935de95cae7b1479675a130f68d6f3158a05 Mon Sep 17 00:00:00 2001
From: a8trejo <abel.trejo@roo.vet>
Date: Mon, 16 Dec 2024 16:35:45 -0800
Subject: [PATCH] Changing auto merge command to merge strategy instead of
 squash

---
 .changeset/eighty-nails-peel.md               |  5 ---
 .changeset/shaggy-moons-dance.md              |  5 ---
 .github/workflows/changeset-release.yml       |  2 +-
 .github/workflows/marketplace-publish.yml     |  2 +-
 .../workflows/temp-marketplace-publish.yml    | 31 -------------------
 5 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 .changeset/eighty-nails-peel.md
 delete mode 100644 .changeset/shaggy-moons-dance.md
 delete mode 100644 .github/workflows/temp-marketplace-publish.yml

diff --git a/.changeset/eighty-nails-peel.md b/.changeset/eighty-nails-peel.md
deleted file mode 100644
index 1810d53..0000000
--- a/.changeset/eighty-nails-peel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Add volume slider in settings and change sound effects to only trigger when user intervention is required, an error occurs, or a task is completed.
diff --git a/.changeset/shaggy-moons-dance.md b/.changeset/shaggy-moons-dance.md
deleted file mode 100644
index e8de22b..0000000
--- a/.changeset/shaggy-moons-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix lint errors and change npm run lint to also run on webview-ui
diff --git a/.github/workflows/changeset-release.yml b/.github/workflows/changeset-release.yml
index 2a002c7..b39a68c 100644
--- a/.github/workflows/changeset-release.yml
+++ b/.github/workflows/changeset-release.yml
@@ -86,6 +86,6 @@ jobs:
 
       # Enable auto-merge for the PR
       - name: Enable automerge on PR
-        run: gh pr merge --squash --auto ${{ github.event.pull_request.number }}
+        run: gh pr merge --merge --auto ${{ github.event.pull_request.number }}
         env:
           GH_TOKEN: ${{ secrets.CROSS_REPO_ACCESS_TOKEN }}
diff --git a/.github/workflows/marketplace-publish.yml b/.github/workflows/marketplace-publish.yml
index 5f99b44..a5fdbbc 100644
--- a/.github/workflows/marketplace-publish.yml
+++ b/.github/workflows/marketplace-publish.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   publish-extension:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'R00-B0T'}}
+    if: ${{ github.actor == 'R00-B0T' || github.event_name == 'workflow_dispatch' }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
diff --git a/.github/workflows/temp-marketplace-publish.yml b/.github/workflows/temp-marketplace-publish.yml
deleted file mode 100644
index a98aca3..0000000
--- a/.github/workflows/temp-marketplace-publish.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Publish Extension Temporary
-on:
-  push:
-    branches: ["main"]
-  workflow_dispatch:
-
-jobs:
-  publish-extension:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        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 install
-          cd webview-ui
-          npm install
-          cd ..
-      - name: Package and Publish Extension
-        env:
-          VSCE_PAT: ${{ secrets.VSCE_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"