diff --git a/.github/workflows/dev1.yml b/.github/workflows/dev1.yml index 2ea97f0..b92db8e 100644 --- a/.github/workflows/dev1.yml +++ b/.github/workflows/dev1.yml @@ -1,11 +1,11 @@ name: Publish NPM package for dev1 on: push: - branches: - - op-kovan-dev1 + branches: + - op-kovan-dev1 jobs: publish-npm-package: - if: github.base_ref != 'main' && github.event_name != 'pull_request' + if: github.base_ref != 'main' && github.event_name != 'pull_request' runs-on: ubuntu-latest outputs: pkg_version: ${{ steps.set-variables.outputs.pkg_version }} @@ -60,7 +60,7 @@ jobs: discord-notification-npm-package: name: Discord Notification for publishing npm package - if: github.base_ref != 'main' && github.event_name != 'pull_request' && always() + if: always() needs: [publish-npm-package] runs-on: ubuntu-latest steps: @@ -73,7 +73,7 @@ jobs: args: "**[@perp/v2-sdk: dev1]** @perp/v2-sdk version: **${{ needs.publish-npm-package.outputs.pkg_version }}** published successfully ✅" - name: issue failure notificaiton - if: needs.publish-npm-package.result != 'success' + if: needs.publish-npm-package.result != 'success' && github.base_ref != 'main' && github.event_name != 'pull_request' env: DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }} uses: Ilshidur/action-discord@master diff --git a/.github/workflows/dev2.yml b/.github/workflows/dev2.yml index a810d7a..9c9d28b 100644 --- a/.github/workflows/dev2.yml +++ b/.github/workflows/dev2.yml @@ -3,8 +3,12 @@ on: push: branches: - op-kovan-dev2 + pull_request: + branches-ignore: + - main jobs: publish-npm-package: + if: github.base_ref != 'main' && github.event_name != 'pull_request' runs-on: ubuntu-latest outputs: pkg_version: ${{ steps.set-variables.outputs.pkg_version }} @@ -74,7 +78,7 @@ jobs: args: "**[@perp/v2-sdk: dev2]** @perp/v2-sdk version: **${{ needs.publish-npm-package.outputs.pkg_version }}** published successfully ✅" - name: issue failure notificaiton - if: needs.publish-npm-package.result != 'success' + if: needs.publish-npm-package.result != 'success' && github.base_ref != 'main' && github.event_name != 'pull_request' env: DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }} uses: Ilshidur/action-discord@master diff --git a/package.json b/package.json index 420a4b0..77a39e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@perp/v2-sdk", - "version": "0.1.5-multicollateral", + "version": "0.1.5-alpha", "license": "BSD 3-Clause", "main": "dist/index.js", "module": "dist/v2-sdk.esm.js",