From fea357f105d96e3d9dbf87687c26bc34b21f8b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20J=C3=A4ggi?= <1872195+solaris007@users.noreply.github.com> Date: Tue, 23 Jan 2024 08:05:14 +0100 Subject: [PATCH] fix: monorepo extends overwrites config (#99) --- .github/workflows/main.yaml | 3 ++- .releaserc.cjs | 2 +- package.json | 4 ++-- .../spacecat-shared-data-access/.releaserc.cjs | 16 +++++++++++++++- packages/spacecat-shared-dynamo/.releaserc.cjs | 16 +++++++++++++++- packages/spacecat-shared-example/.releaserc.cjs | 16 +++++++++++++++- .../spacecat-shared-http-utils/.releaserc.cjs | 16 +++++++++++++++- .../.releaserc.cjs | 16 +++++++++++++++- packages/spacecat-shared-utils/.releaserc.cjs | 16 +++++++++++++++- 9 files changed, 95 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 5ece1a09..190f480a 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -41,7 +41,8 @@ jobs: with: node-version: '20.x' - run: npm ci - - run: npm run semantic-release + - name: Semantic Release + run: npm run semantic-release env: GITHUB_TOKEN: ${{ secrets.ADOBE_BOT_GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.ADOBE_BOT_NPM_TOKEN }} diff --git a/.releaserc.cjs b/.releaserc.cjs index c5b49f54..b93885dd 100644 --- a/.releaserc.cjs +++ b/.releaserc.cjs @@ -1,5 +1,5 @@ module.exports = { - extends: "semantic-release-monorepo", + extends: "@solaris007/semantic-release-monorepo", plugins: [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", diff --git a/package.json b/package.json index c9e9816b..d4e3adfb 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "docs": "npm run docs:api", "test": "npm test -ws", "lint": "npm run lint -ws", - "semantic-release": "npx --no -ws semantic-release -e @solaris007/semantic-release-monorepo", - "semantic-release-dry": "npx --no -ws semantic-release -e @solaris007/semantic-release-monorepo --dry-run --branches $CI_BRANCH", + "semantic-release": "npx --no -ws semantic-release", + "semantic-release-dry": "npx --no -ws semantic-release --dry-run --branches $CI_BRANCH", "prepare": "husky install", "clean": "rm -rf package-lock.json node_modules" }, diff --git a/packages/spacecat-shared-data-access/.releaserc.cjs b/packages/spacecat-shared-data-access/.releaserc.cjs index e6a0c3a3..b93885dd 100644 --- a/packages/spacecat-shared-data-access/.releaserc.cjs +++ b/packages/spacecat-shared-data-access/.releaserc.cjs @@ -1,3 +1,17 @@ module.exports = { - extends: '../../.releaserc.cjs', + extends: "@solaris007/semantic-release-monorepo", + plugins: [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + ["@semantic-release/changelog", { + "changelogFile": "CHANGELOG.md", + }], + "@semantic-release/npm", + ["@semantic-release/git", { + "assets": ["package.json", "CHANGELOG.md"], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + }], + ["@semantic-release/github", {}], + ], + branches: ['main'], }; diff --git a/packages/spacecat-shared-dynamo/.releaserc.cjs b/packages/spacecat-shared-dynamo/.releaserc.cjs index e6a0c3a3..b93885dd 100644 --- a/packages/spacecat-shared-dynamo/.releaserc.cjs +++ b/packages/spacecat-shared-dynamo/.releaserc.cjs @@ -1,3 +1,17 @@ module.exports = { - extends: '../../.releaserc.cjs', + extends: "@solaris007/semantic-release-monorepo", + plugins: [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + ["@semantic-release/changelog", { + "changelogFile": "CHANGELOG.md", + }], + "@semantic-release/npm", + ["@semantic-release/git", { + "assets": ["package.json", "CHANGELOG.md"], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + }], + ["@semantic-release/github", {}], + ], + branches: ['main'], }; diff --git a/packages/spacecat-shared-example/.releaserc.cjs b/packages/spacecat-shared-example/.releaserc.cjs index e6a0c3a3..b93885dd 100644 --- a/packages/spacecat-shared-example/.releaserc.cjs +++ b/packages/spacecat-shared-example/.releaserc.cjs @@ -1,3 +1,17 @@ module.exports = { - extends: '../../.releaserc.cjs', + extends: "@solaris007/semantic-release-monorepo", + plugins: [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + ["@semantic-release/changelog", { + "changelogFile": "CHANGELOG.md", + }], + "@semantic-release/npm", + ["@semantic-release/git", { + "assets": ["package.json", "CHANGELOG.md"], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + }], + ["@semantic-release/github", {}], + ], + branches: ['main'], }; diff --git a/packages/spacecat-shared-http-utils/.releaserc.cjs b/packages/spacecat-shared-http-utils/.releaserc.cjs index e6a0c3a3..b93885dd 100644 --- a/packages/spacecat-shared-http-utils/.releaserc.cjs +++ b/packages/spacecat-shared-http-utils/.releaserc.cjs @@ -1,3 +1,17 @@ module.exports = { - extends: '../../.releaserc.cjs', + extends: "@solaris007/semantic-release-monorepo", + plugins: [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + ["@semantic-release/changelog", { + "changelogFile": "CHANGELOG.md", + }], + "@semantic-release/npm", + ["@semantic-release/git", { + "assets": ["package.json", "CHANGELOG.md"], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + }], + ["@semantic-release/github", {}], + ], + branches: ['main'], }; diff --git a/packages/spacecat-shared-rum-api-client/.releaserc.cjs b/packages/spacecat-shared-rum-api-client/.releaserc.cjs index e6a0c3a3..b93885dd 100644 --- a/packages/spacecat-shared-rum-api-client/.releaserc.cjs +++ b/packages/spacecat-shared-rum-api-client/.releaserc.cjs @@ -1,3 +1,17 @@ module.exports = { - extends: '../../.releaserc.cjs', + extends: "@solaris007/semantic-release-monorepo", + plugins: [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + ["@semantic-release/changelog", { + "changelogFile": "CHANGELOG.md", + }], + "@semantic-release/npm", + ["@semantic-release/git", { + "assets": ["package.json", "CHANGELOG.md"], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + }], + ["@semantic-release/github", {}], + ], + branches: ['main'], }; diff --git a/packages/spacecat-shared-utils/.releaserc.cjs b/packages/spacecat-shared-utils/.releaserc.cjs index e6a0c3a3..b93885dd 100644 --- a/packages/spacecat-shared-utils/.releaserc.cjs +++ b/packages/spacecat-shared-utils/.releaserc.cjs @@ -1,3 +1,17 @@ module.exports = { - extends: '../../.releaserc.cjs', + extends: "@solaris007/semantic-release-monorepo", + plugins: [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + ["@semantic-release/changelog", { + "changelogFile": "CHANGELOG.md", + }], + "@semantic-release/npm", + ["@semantic-release/git", { + "assets": ["package.json", "CHANGELOG.md"], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + }], + ["@semantic-release/github", {}], + ], + branches: ['main'], };