diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b15e0ccb8..ce8d58abc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,8 +138,6 @@ jobs: - name: Install deps shell: bash run: npm i - - name: Rebuild packages - run: npm run build - name: git config shell: bash run: | @@ -163,3 +161,4 @@ jobs: run: | git tag -f last-release git push origin last-release --force --no-verify + git push origin master --no-verify diff --git a/packages/advisor-components/project.json b/packages/advisor-components/project.json index 83ddcdcfc..06569c5cd 100644 --- a/packages/advisor-components/project.json +++ b/packages/advisor-components/project.json @@ -78,9 +78,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -99,6 +98,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/chrome/project.json b/packages/chrome/project.json index 045440ebf..6fd7aac19 100644 --- a/packages/chrome/project.json +++ b/packages/chrome/project.json @@ -52,9 +52,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -73,6 +72,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/components/project.json b/packages/components/project.json index 442e87df4..6c503e35a 100644 --- a/packages/components/project.json +++ b/packages/components/project.json @@ -77,9 +77,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -98,6 +97,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/config-utils/project.json b/packages/config-utils/project.json index 20deb6458..38f19091d 100644 --- a/packages/config-utils/project.json +++ b/packages/config-utils/project.json @@ -31,9 +31,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -52,6 +51,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/config/project.json b/packages/config/project.json index 0c362b5de..1783068d3 100644 --- a/packages/config/project.json +++ b/packages/config/project.json @@ -39,9 +39,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -60,6 +59,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/eslint-config/project.json b/packages/eslint-config/project.json index 69fc1733f..c6777643c 100644 --- a/packages/eslint-config/project.json +++ b/packages/eslint-config/project.json @@ -26,9 +26,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -47,6 +46,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/notifications/project.json b/packages/notifications/project.json index 91ec31a16..c4b2e1eb8 100644 --- a/packages/notifications/project.json +++ b/packages/notifications/project.json @@ -67,9 +67,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -88,6 +87,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/remediations/project.json b/packages/remediations/project.json index 29412367d..62f22a2f2 100644 --- a/packages/remediations/project.json +++ b/packages/remediations/project.json @@ -68,9 +68,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -89,6 +88,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/rule-components/project.json b/packages/rule-components/project.json index 4ea2bc710..c0137988c 100644 --- a/packages/rule-components/project.json +++ b/packages/rule-components/project.json @@ -68,9 +68,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -89,6 +88,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/testing/project.json b/packages/testing/project.json index 24e18e1b8..2a3ee0690 100644 --- a/packages/testing/project.json +++ b/packages/testing/project.json @@ -60,9 +60,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -81,6 +80,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/translations/project.json b/packages/translations/project.json index 54ab55cdd..e49207ca4 100644 --- a/packages/translations/project.json +++ b/packages/translations/project.json @@ -79,9 +79,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -100,6 +99,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/tsc-transform-imports/project.json b/packages/tsc-transform-imports/project.json index 751c81054..44225fe72 100644 --- a/packages/tsc-transform-imports/project.json +++ b/packages/tsc-transform-imports/project.json @@ -31,9 +31,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -52,6 +51,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/types/project.json b/packages/types/project.json index d19763ec8..daf0788f0 100644 --- a/packages/types/project.json +++ b/packages/types/project.json @@ -25,9 +25,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -46,6 +45,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } } diff --git a/packages/utils/project.json b/packages/utils/project.json index f5e9ab69a..c05ae536e 100644 --- a/packages/utils/project.json +++ b/packages/utils/project.json @@ -67,9 +67,8 @@ "executor": "@jscutlery/semver:version", "options": { "preset": "conventionalcommits", - "postTargets": ["build", "deploy", "github"], + "postTargets": ["tagRelease", "build", "deploy", "github"], "trackDeps": true, - "push": true, "commitMessageFormat": "release: bump {projectName} to {version} [skip ci]" } @@ -88,6 +87,12 @@ "access": "public" }, "dependsOn": ["build"] + }, + "tagRelease": { + "executor": "nx:run-commands", + "options": { + "command": "git push --tags" + } } } }