From c74be4cad3356d9fddc78f5cdce6b19c82c159bf Mon Sep 17 00:00:00 2001
From: Ashutosh Khanduala <ashu.khanduala@gmail.com>
Date: Thu, 9 May 2024 11:45:42 +0530
Subject: [PATCH] changeset publish action changes

---
 .github/workflows/changeset-publish.yml     | 22 ++++++++++-----------
 example/webapp                              |  2 +-
 lib/js-sdk/.changeset/many-steaks-care.md   |  5 +++++
 lib/js-sdk/.changeset/wicked-otters-walk.md |  5 -----
 lib/js-sdk/package.json                     |  3 ++-
 package.json                                |  3 +--
 6 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 lib/js-sdk/.changeset/many-steaks-care.md
 delete mode 100644 lib/js-sdk/.changeset/wicked-otters-walk.md

diff --git a/.github/workflows/changeset-publish.yml b/.github/workflows/changeset-publish.yml
index 0b522da..9f65088 100644
--- a/.github/workflows/changeset-publish.yml
+++ b/.github/workflows/changeset-publish.yml
@@ -1,9 +1,8 @@
-name: Publish
+name: Release
 on:
-  workflow_run:
-    workflows: [CI]
-    branches: [main]
-    types: [completed]
+  push:
+    branches:
+      - main
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
@@ -12,8 +11,8 @@ permissions:
   pull-requests: write
 
 jobs:
-  publish:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+  release:
+    name: Release
     runs-on: ubuntu-latest
     steps:
       - name: Action checkout
@@ -34,17 +33,16 @@ jobs:
       - name: Installing dependencies
         run: yarn install
 
-      - name: tsc Linting
+      - name: tsc Linting and Build
         working-directory: lib/js-sdk
-        run: yarn lint
+        run: yarn lint && yarn build
 
       - name: Create Release Pull Request or Publish
         id: changesets
         uses: changesets/action@v1
         with:
-          publish: yarn release
+          publish: yarn publish
           cwd: lib/js-sdk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.npm_token2 }}
-          NODE_AUTH_TOKEN: ${{secrets.npm_token2}}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/example/webapp b/example/webapp
index a9096cf..64c97ec 160000
--- a/example/webapp
+++ b/example/webapp
@@ -1 +1 @@
-Subproject commit a9096cf78a5837d8e9c77fbe101a506ffc123221
+Subproject commit 64c97ecd84df06dbc2db9fc11968c578a1239c5f
diff --git a/lib/js-sdk/.changeset/many-steaks-care.md b/lib/js-sdk/.changeset/many-steaks-care.md
new file mode 100644
index 0000000..22dfc3a
--- /dev/null
+++ b/lib/js-sdk/.changeset/many-steaks-care.md
@@ -0,0 +1,5 @@
+---
+"@zerochain/zus-sdk": patch
+---
+
+Package.json changes
diff --git a/lib/js-sdk/.changeset/wicked-otters-walk.md b/lib/js-sdk/.changeset/wicked-otters-walk.md
deleted file mode 100644
index 0f355af..0000000
--- a/lib/js-sdk/.changeset/wicked-otters-walk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@zerochain/zus-sdk": minor
----
-
-add TS support
diff --git a/lib/js-sdk/package.json b/lib/js-sdk/package.json
index 7c1dc75..d0b0866 100644
--- a/lib/js-sdk/package.json
+++ b/lib/js-sdk/package.json
@@ -8,7 +8,8 @@
     "build": "tsc",
     "build:tsup": "tsup src/index.ts --format cjs,esm --dts",
     "lint": "tsc --noEmit",
-    "release": "yarn build && yarn changeset publish",
+    "publish": "yarn changeset publish",
+    "buildpub": "yarn build && yarn publish",
     "version": "yarn changeset"
   },
   "main": "dist/index.js",
diff --git a/package.json b/package.json
index 7eb471c..5304b3c 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,7 @@
     "dev": "concurrently \"yarn dev:app\" \"yarn dev:lib\"",
     "build:app": "cd ./example/webapp && yarn build",
     "build:lib": "cd ./lib/js-sdk && yarn build",
-    "build": "yarn build:app && yarn build:lib",
-    "version": "cd ./lib/js-sdk && yarn version"
+    "build": "yarn build:app && yarn build:lib"
   },
   "devDependencies": {
     "concurrently": "^8.2.2"