From 9ce97a726a3aba5f7d8e5ac838ec8b8a4ac4ba55 Mon Sep 17 00:00:00 2001 From: Egor Didenko Date: Thu, 23 May 2024 11:00:03 -0400 Subject: [PATCH 1/2] ci: updated nx and lerna repair --- .gitignore | 2 ++ nx.json | 24 +++++++++++++++++------- packages/react-uploader/package.json | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8e304b0..da98013 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ node_modules dist .env docs + +.nx/cache \ No newline at end of file diff --git a/nx.json b/nx.json index 64b392e..6bf2048 100644 --- a/nx.json +++ b/nx.json @@ -2,18 +2,28 @@ "targetDefaults": { "dev": { "cache": true, - "dependsOn": ["^dev"] + "dependsOn": [ + "^dev" + ] }, "build": { "cache": true, - "dependsOn": ["^build"] + "dependsOn": [ + "^build" + ] }, "preview": { "dependsOn": [] - }, - "test": { - "cache": true, - "dependsOn": ["^test"] } + }, + "namedInputs": { + "default": [ + "{projectRoot}/**/*", + "sharedGlobals" + ], + "sharedGlobals": [], + "production": [ + "default" + ] } -} +} \ No newline at end of file diff --git a/packages/react-uploader/package.json b/packages/react-uploader/package.json index 282c3b6..843105c 100644 --- a/packages/react-uploader/package.json +++ b/packages/react-uploader/package.json @@ -81,4 +81,4 @@ "react hook file upload", "front-end" ] -} \ No newline at end of file +} From c13583ba942dfe59a135d15039a8fb3f14da4531 Mon Sep 17 00:00:00 2001 From: Egor Didenko Date: Thu, 23 May 2024 11:02:09 -0400 Subject: [PATCH 2/2] ci: deployed only from main --- .github/workflows/release-manual.yml | 6 +----- lerna.json | 6 ++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-manual.yml b/.github/workflows/release-manual.yml index 5f63046..a0dea42 100644 --- a/.github/workflows/release-manual.yml +++ b/.github/workflows/release-manual.yml @@ -33,11 +33,7 @@ jobs: git config --global user.email "github-actions[bot]@users.noreply.github.com" git config --global user.name "github-actions[bot]" - if [ ${{ github.base_ref }} = develop ]; then - npx lerna version --conventional-commits --conventional-prerelease --preid alpha --yes - else - npx lerna version --conventional-commits --conventional-graduate --yes - fi + npx lerna version --conventional-commits --conventional-graduate --yes npm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN npx lerna publish from-git --yes \ No newline at end of file diff --git a/lerna.json b/lerna.json index a626e01..113fb3f 100644 --- a/lerna.json +++ b/lerna.json @@ -5,8 +5,10 @@ "version": { "createRelease": "github", "conventionalCommits": true, - "allowBranch": ["main", "develop"], + "allowBranch": [ + "main" + ], "message": "chore(release): publish" } } -} +} \ No newline at end of file