From 44acea19301dc8663e8de8592af3388929f7270f Mon Sep 17 00:00:00 2001 From: Rubilmax Date: Thu, 17 Oct 2024 16:40:03 +0200 Subject: [PATCH] fix(publish): revert to semantic-release --- .github/workflows/publish.yml | 39 ++++++++++++++-------- package.json | 26 +++++++++++++-- packages/blue-api-sdk/package.json | 2 +- packages/blue-sdk-ethers/package.json | 2 +- packages/blue-sdk-viem/package.json | 2 +- packages/blue-sdk-wagmi/package.json | 2 +- packages/blue-sdk/package.json | 2 +- packages/bundler-sdk-viem/package.json | 2 +- packages/liquidation-sdk-viem/package.json | 2 +- packages/morpho-test/package.json | 2 +- packages/morpho-ts/package.json | 2 +- packages/simulation-sdk-wagmi/package.json | 2 +- packages/simulation-sdk/package.json | 2 +- packages/test-ethers/package.json | 2 +- packages/test-viem/package.json | 2 +- packages/test-wagmi/package.json | 2 +- packages/test/package.json | 2 +- 17 files changed, 65 insertions(+), 30 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 59df54fe..887eee40 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,23 +30,36 @@ jobs: - run: pnpm install + - run: pnpm -r --parallel -c exec "jq '.release = input.release_version' package.json ../../package.json > tmp.json && mv tmp.json package.json" + + - run: pnpm -r --parallel --no-reporter-hide-prefix exec semantic-release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - run: pnpm -r --parallel -c exec "jq '.release = input.release_publish' package.json ../../package.json > tmp.json && mv tmp.json package.json" + - run: | - git config --global user.name 'github-actions' - git config --global user.email 'github-actions@users.noreply.github.com' + echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc - - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc + pnpm -r --parallel --no-reporter-hide-prefix exec semantic-release - - if: github.ref == 'refs/heads/main' - run: | - pnpm lerna publish -m "chore(release): publish %s" --no-private --conventional-commits --no-changelog --yes + # - run: | + # git config --global user.name 'github-actions' + # git config --global user.email 'github-actions@users.noreply.github.com' - - if: github.ref == 'refs/heads/next' - run: | - pnpm lerna publish -m "chore(release): publish %s" --dist-tag next --exact --no-private --conventional-commits --conventional-prerelease --no-changelog --yes + # - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc - - run: pnpm -r --parallel -c exec "jq '.release = input.release' package.json ../../package.json > tmp.json && mv tmp.json package.json" + # - if: github.ref == 'refs/heads/main' + # run: | + # pnpm lerna publish -m "chore(release): publish %s" --no-private --conventional-commits --no-changelog --yes - - run: pnpm -r --parallel --no-reporter-hide-prefix exec semantic-release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - if: github.ref == 'refs/heads/next' + # run: | + # pnpm lerna publish -m "chore(release): publish %s" --dist-tag next --exact --no-private --conventional-commits --conventional-prerelease --no-changelog --yes + + # - run: pnpm -r --parallel -c exec "jq '.release = input.release' package.json ../../package.json > tmp.json && mv tmp.json package.json" + + # - run: pnpm -r --parallel --no-reporter-hide-prefix exec semantic-release + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 15b23098..b824b453 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "commitlint": { "extends": ["@commitlint/config-conventional"] }, - "release": { + "release_version": { "branches": [ "main", { @@ -52,8 +52,30 @@ "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", + [ + "@semantic-release/exec", + { + "prepareCmd": "pnpm version ${nextRelease.version} --no-git-tag-version" + } + ], "@semantic-release/github" ] }, - "dependencies": {} + "release_publish": { + "branches": [ + "main", + { + "name": "next", + "prerelease": true + } + ], + "plugins": [ + [ + "@semantic-release/exec", + { + "publishCmd": "pnpm publish --access public --tag ${nextRelease.channel} --no-git-checks" + } + ] + ] + } } diff --git a/packages/blue-api-sdk/package.json b/packages/blue-api-sdk/package.json index 7e5f273b..11167067 100644 --- a/packages/blue-api-sdk/package.json +++ b/packages/blue-api-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-api-sdk", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "type": "module", "main": "src/index.ts", diff --git a/packages/blue-sdk-ethers/package.json b/packages/blue-sdk-ethers/package.json index b4e357d6..11b7aef5 100644 --- a/packages/blue-sdk-ethers/package.json +++ b/packages/blue-sdk-ethers/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-ethers", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "license": "MIT", "type": "module", diff --git a/packages/blue-sdk-viem/package.json b/packages/blue-sdk-viem/package.json index 64589f1b..bb4ba6d0 100644 --- a/packages/blue-sdk-viem/package.json +++ b/packages/blue-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-viem", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/blue-sdk-wagmi/package.json b/packages/blue-sdk-wagmi/package.json index ca7cca32..6acedede 100644 --- a/packages/blue-sdk-wagmi/package.json +++ b/packages/blue-sdk-wagmi/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk-wagmi", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "license": "MIT", "type": "module", diff --git a/packages/blue-sdk/package.json b/packages/blue-sdk/package.json index b4648e44..48bcb35b 100644 --- a/packages/blue-sdk/package.json +++ b/packages/blue-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/blue-sdk", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "license": "MIT", "type": "module", diff --git a/packages/bundler-sdk-viem/package.json b/packages/bundler-sdk-viem/package.json index 2fad5bbf..22befc94 100644 --- a/packages/bundler-sdk-viem/package.json +++ b/packages/bundler-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/bundler-sdk-viem", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "license": "MIT", "type": "module", diff --git a/packages/liquidation-sdk-viem/package.json b/packages/liquidation-sdk-viem/package.json index 9ddcc62e..a03223c7 100644 --- a/packages/liquidation-sdk-viem/package.json +++ b/packages/liquidation-sdk-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/liquidation-sdk-viem", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "type": "module", "main": "src/index.ts", diff --git a/packages/morpho-test/package.json b/packages/morpho-test/package.json index f8bfde88..c42d5011 100644 --- a/packages/morpho-test/package.json +++ b/packages/morpho-test/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-test", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "type": "module", "main": "src/index.ts", diff --git a/packages/morpho-ts/package.json b/packages/morpho-ts/package.json index 1d540680..1c60ddb2 100644 --- a/packages/morpho-ts/package.json +++ b/packages/morpho-ts/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/morpho-ts", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "license": "MIT", "main": "src/index.ts", diff --git a/packages/simulation-sdk-wagmi/package.json b/packages/simulation-sdk-wagmi/package.json index 7cff701a..4a3033a8 100644 --- a/packages/simulation-sdk-wagmi/package.json +++ b/packages/simulation-sdk-wagmi/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/simulation-sdk-wagmi", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "license": "MIT", "type": "module", diff --git a/packages/simulation-sdk/package.json b/packages/simulation-sdk/package.json index 10dececb..4babde10 100644 --- a/packages/simulation-sdk/package.json +++ b/packages/simulation-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/simulation-sdk", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "license": "MIT", "type": "module", diff --git a/packages/test-ethers/package.json b/packages/test-ethers/package.json index bd7d2565..f68ade80 100644 --- a/packages/test-ethers/package.json +++ b/packages/test-ethers/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/test-ethers", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "type": "module", "main": "src/index.ts", diff --git a/packages/test-viem/package.json b/packages/test-viem/package.json index a1556a7b..8055d74b 100644 --- a/packages/test-viem/package.json +++ b/packages/test-viem/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/test-viem", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "type": "module", "main": "src/index.ts", diff --git a/packages/test-wagmi/package.json b/packages/test-wagmi/package.json index c43a85a5..c0521dca 100644 --- a/packages/test-wagmi/package.json +++ b/packages/test-wagmi/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/test-wagmi", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "type": "module", "main": "src/index.ts", diff --git a/packages/test/package.json b/packages/test/package.json index e8b6159f..9934a1ba 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@morpho-org/test", - "version": "1.12.5-alpha.0", + "version": "1.12.4", "author": "Morpho Association ", "type": "module", "main": "src/index.ts",