Merge pull request cockroachdb#91908 from nathanstilwell/cluster-ui-w…

…orkflow-error
yuzefovich · Nov 16, 2022 · 65c572d · 65c572d
2 parents db73c5e + d80a32e
commit 65c572d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/cluster-ui-release-next.yml b/.github/workflows/cluster-ui-release-next.yml
@@ -10,6 +10,7 @@ on:
 
 jobs:
   publish_cluster_ui:
+    if: github.repository == 'cockroachdb/cockroach'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -39,7 +40,7 @@ jobs:
       id: version-check
       shell: bash
       run: |
-        PACKAGE_VERSION=$(cat ./pkg/ui/workspaces/cluster-ui/package.json | jq -r ".version");
+        PACKAGE_VERSION=$(cat ./package.json | jq -r ".version");
         VERSIONS=$(npm view @cockroachlabs/cluster-ui versions)
         if [[ $VERSIONS == *"$PACKAGE_VERSION"* ]]; then
           echo "published=yes" >> $GITHUB_OUTPUT
@@ -57,4 +58,4 @@ jobs:
 
     - name: Publish prerelease version
       if: steps.version-check.outputs.published == 'no'
-      run: npm publish --access public --tag next --dry-run"
+      run: npm publish --access public --tag next --dry-run
diff --git a/.github/workflows/cluster-ui-release.yml b/.github/workflows/cluster-ui-release.yml
@@ -10,6 +10,7 @@ on:
 
 jobs:
   publish_cluster_ui:
+    if: github.repository == 'cockroachdb/cockroach'
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -39,7 +40,7 @@ jobs:
       id: version-check
       shell: bash
       run: |
-        PACKAGE_VERSION=$(cat ./pkg/ui/workspaces/cluster-ui/package.json | jq -r ".version");
+        PACKAGE_VERSION=$(cat ./package.json | jq -r ".version");
         VERSIONS=$(npm view @cockroachlabs/cluster-ui versions)
         if [[ $VERSIONS == *"$PACKAGE_VERSION"* ]]; then
           echo "published=yes" >> $GITHUB_OUTPUT
@@ -62,4 +63,4 @@ jobs:
 
     - name: Publish patch version
       if: steps.version-check.outputs.published == 'no'
-      run: npm publish --access public --tag ${{ steps.branch_name.outputs.branch }} --dry-run"
+      run: npm publish --access public --tag ${{ steps.branch_name.outputs.branch }} --dry-run