From b09b690b53bc93bb6b92ca14c81116816d85d8ca Mon Sep 17 00:00:00 2001
From: "Sarver, Edwin" <edwin.sarver@keithley.com>
Date: Mon, 1 Jul 2024 14:55:20 -0400
Subject: [PATCH] Add correct conditional, comment out actual publish step (to
 be added back later, can't remove published versions yet
 https://github.com/microsoft/vsmarketplace/issues/235)

---
 .github/workflows/pr.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index aa7a98f..aebe3c0 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -146,7 +146,7 @@ jobs:
       - sbom
       - lint
       - style
-    if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) || github.event.pull_request.merged ) }}
+    if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) && github.event.pull_request.merged ) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -162,7 +162,7 @@ jobs:
         run: |
           echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" > .npmrc
           npm install --devDependencies
-          npx vsce publish --packagePath extension/*.vsix
+          # npx vsce publish --packagePath extension/*.vsix
         env:
           VSCE_PAT: ${{secrets.VSCE_PAT}}