From 21e95031f8ae400486678e805e87d0c25a56cdc1 Mon Sep 17 00:00:00 2001 From: Alexandre ABRIOUX Date: Tue, 4 Mar 2025 23:32:19 +0100 Subject: [PATCH 1/2] ci: fix next-release --- .circleci/config.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3bf036d7a..2ee301e7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -281,6 +281,18 @@ jobs: - store_test_results: path: packages/payment-processor/reports/ + test-version: + docker: + - *node_image + working_directory: *working_directory + resource_class: large + steps: + - attach_workspace: + at: *working_directory + - run: + name: 'test version' + command: yarn lerna version prerelease --no-git-tag-version --no-push --preid next.$(git rev-parse --short HEAD) + # Release a next version package everytime we merge to master next-release: docker: @@ -324,6 +336,16 @@ workflows: requires: - build + - test-version: + requires: + - lint + - build + - test-unit + - test-integration-with-smart-contracts + - test-integration-with-request-node + - test-usage-examples + - test-toolbox + # Release a next version package everytime we merge to master - next-release: requires: From 3d857c163dc172ef2c3653e5049de209d549885b Mon Sep 17 00:00:00 2001 From: Alexandre ABRIOUX Date: Wed, 5 Mar 2025 01:01:20 +0100 Subject: [PATCH 2/2] update script --- .circleci/config.yml | 22 ---------------------- package.json | 4 ++-- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ee301e7e..3bf036d7a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -281,18 +281,6 @@ jobs: - store_test_results: path: packages/payment-processor/reports/ - test-version: - docker: - - *node_image - working_directory: *working_directory - resource_class: large - steps: - - attach_workspace: - at: *working_directory - - run: - name: 'test version' - command: yarn lerna version prerelease --no-git-tag-version --no-push --preid next.$(git rev-parse --short HEAD) - # Release a next version package everytime we merge to master next-release: docker: @@ -336,16 +324,6 @@ workflows: requires: - build - - test-version: - requires: - - lint - - build - - test-unit - - test-integration-with-smart-contracts - - test-integration-with-request-node - - test-usage-examples - - test-toolbox - # Release a next version package everytime we merge to master - next-release: requires: diff --git a/package.json b/package.json index a5a737f1e..cff3580f4 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "lerna": "lerna", "packageJsonLint": "npmPkgJsonLint ./packages", "publish-npm": "lerna publish --conventional-commits --exact --message \"chore(release): publish %s\" --no-changelog --yes", - "publish-manual-prerelease": "lerna publish --canary prerelease --no-git-tag-version --no-push --preid next --dist-tag next", - "publish-prerelease": "FORCE_PUBLISH=$(lerna changed --json | jq '. | map(.name) | join (\",\")' -r) && echo $FORCE_PUBLISH && lerna publish --canary prerelease --no-git-tag-version --no-push --preid next --dist-tag next --yes --force-publish=${FORCE_PUBLISH}", + "publish-manual-prerelease": "lerna publish prerelease --no-git-tag-version --no-push --preid next.$(git rev-parse --short HEAD) --dist-tag next.$(git rev-parse --short HEAD)", + "publish-prerelease": "FORCE_PUBLISH=$(lerna changed --json | jq '. | map(.name) | join (\",\")' -r) && echo $FORCE_PUBLISH && lerna publish prerelease --no-git-tag-version --no-push --preid next.$(git rev-parse --short HEAD) --dist-tag next.$(git rev-parse --short HEAD) --yes --force-publish=${FORCE_PUBLISH}", "deploy:contracts": "yarn workspace @requestnetwork/smart-contracts deploy", "start:request-node": "LIT_PROTOCOL_NETWORK=datil-dev yarn workspace @requestnetwork/request-node start", "test": "lerna run test",