Skip to content

Commit 508be60

Browse files
committed
feat: set-version at publish task
1 parent df8c648 commit 508be60

File tree

63 files changed

+111
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+111
-13
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,14 @@ jobs:
7676
with:
7777
#TODO Remove when migrate to Node 24
7878
npm-version: '11.5'
79-
- run: yarn set:version ${{ inputs.version }}
8079
- name: Get tag name
8180
id: get-npm-tag
8281
uses: ./tools/github-actions/get-npm-tag
8382
with:
8483
is-prerelease: ${{ inputs.prerelease }}
8584
version: ${{ inputs.version }}
8685
- name: Publish
87-
run: yarn run publish --tag=${{ inputs.isPullRequest && 'pr' || steps.get-npm-tag.outputs.tag }} ${{ inputs.isPullRequest && '--userconfig=./.npmrc.pr' || ''}}
86+
run: yarn run publish --set-version=${{ inputs.version }} --tag=${{ inputs.isPullRequest && 'pr' || steps.get-npm-tag.outputs.tag }} ${{ inputs.isPullRequest && '--userconfig=./.npmrc.pr' || ''}}
8887
env:
8988
GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9089
AZURE_AUTH_TOKEN: ${{ secrets.AZURE_AUTH_TOKEN }}
@@ -136,10 +135,9 @@ jobs:
136135
fetch-depth: 2
137136
- uses: ./tools/github-actions/download-build-output
138137
- uses: ./tools/github-actions/setup
139-
- run: yarn set:version ${{ inputs.version }}
140138
- name: Publish Extensions
141139
if: '!inputs.prerelease'
142-
run: yarn run ${{ endsWith(inputs.version, '.0') && 'publish:extensions' || 'publish:extensions:affected' }}
140+
run: yarn run ${{ endsWith(inputs.version, '.0') && 'publish:extensions' || 'publish:extensions:affected' }} --set-version=${{ inputs.version }} --tag=${{ inputs.isPullRequest && 'pr' || steps.get-npm-tag.outputs.tag }}
143141
env:
144142
NX_BASE: HEAD~1
145143
VSCE_PAT: ${{ secrets.AZURE_VSC_EXT_TOKEN }}

apps/chrome-devtools/project.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,16 @@
161161
"{projectRoot}/src/options.html"
162162
]
163163
},
164+
"set-version": {},
164165
"publish-extension": {
165166
"executor": "nx:run-script",
166167
"options": {
167168
"script": "publish-to-market"
168-
}
169+
},
170+
"dependsOn": [
171+
"build",
172+
"set-version"
173+
]
169174
}
170175
},
171176
"tags": []

apps/vscode-extension/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
},
2828
"lint": {},
2929
"test": {},
30+
"set-version": {},
3031
"prepare-publish": {
3132
"options": {
3233
"commands": [

nx.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,32 @@
267267
"outputs": [],
268268
"inputs": [
269269
"{projectRoot}/dist"
270+
],
271+
"dependsOn": [
272+
{
273+
"projects": "self",
274+
"target": "prepare-publish",
275+
"params": "forward"
276+
}
277+
]
278+
},
279+
"set-version": {
280+
"cache": false,
281+
"executor": "nx:run-commands",
282+
"options": {
283+
"command": "yarn o3r-set-version {args.set-version} --set-public='{args.set-public}' --placeholder=0.0.0-placeholder --include='{projectRoot}/dist/package.json' --include='{projectRoot}/dist/manifest.json'",
284+
"forwardAllArgs": false
285+
},
286+
"inputs": [
287+
"{projectRoot}/dist/package.json",
288+
"{projectRoot}/dist/manifest.json"
289+
],
290+
"outputs": [
291+
"{projectRoot}/dist/package.json",
292+
"{projectRoot}/dist/manifest.json"
293+
],
294+
"dependsOn": [
295+
"build"
270296
]
271297
},
272298
"prepare-publish": {
@@ -292,6 +318,11 @@
292318
"{projectRoot}/dist/LICENSE"
293319
],
294320
"dependsOn": [
321+
{
322+
"projects": "self",
323+
"target": "set-version",
324+
"params": "forward"
325+
},
295326
"build"
296327
]
297328
},

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"build:tools": "yarn nx run-many --target=build --projects=eslint-plugin,workspace,test-helpers",
1818
"build:lint": "yarn nx run-many --target=build --projects=eslint-plugin",
1919
"build:swagger-gen": "yarn nx run-many --target=build-swagger",
20-
"publish": "yarn nx run-many --target=prepare-publish --exclude-task-dependencies && yarn nx run-many --target=publish --exclude=tag:private",
21-
"publish:extensions": "yarn nx run-many --target=prepare-publish --exclude-task-dependencies && yarn nx run-many --target=publish-extension",
20+
"publish": "yarn nx run-many --target=publish --exclude=tag:private",
21+
"publish:extensions": "yarn nx run-many --target=publish-extension",
2222
"publish:extensions:affected": "yarn nx affected --target=publish-extension",
2323
"package-github-actions:affected": "yarn nx affected --target=package-github-action",
2424
"lint": "yarn nx run-many --target=lint",
@@ -30,7 +30,6 @@
3030
"postinstall": "husky && yarn build:lint && yarn harmonize:version && yarn update-yarn-sdks && yarn install --mode=skip-build",
3131
"update-yarn-sdks": "node -e \"'pnp' !== '$(yarn config get nodeLinker)' || process.exit(1)\" || yarn sdks",
3232
"clear": "rimraf -g './{packages,tools,apps}/{@*/,}{amaterasu/,}*/{dist,build,dist-*}/'",
33-
"set:version": "yarn o3r-set-version --placeholder 0.0.0-placeholder --include '{apps,packages,tools}/**/dist/{package,manifest}.json'",
3433
"harmonize:version": "eslint --quiet --fix $(git ls-files \":(glob)**/package.json\" .yarnrc.yml)",
3534
"doc:packages": "yarn nx run-many --target=documentation",
3635
"doc:root": "yarn prepare-doc-root-menu-template && yarn update-doc-summary ./docs && yarn compodoc",
@@ -42,8 +41,8 @@
4241
"verdaccio:start-persistent": "docker run -d -it --rm --name verdaccio -p 4873:4873 -v \"$(yarn get:current-dir)/.verdaccio/conf\":/verdaccio/conf -v \"$(yarn get:current-dir)/.verdaccio/storage\":/verdaccio/storage:z verdaccio/verdaccio",
4342
"verdaccio:clean": "rimraf -g \".verdaccio/storage/@{o3r,ama-sdk,ama-terasu,ama-mfe,ama-styling,o3r-training,ama-mcp}\"",
4443
"verdaccio:login": "yarn cpy .verdaccio/conf/.npmrc .verdaccio/conf --rename=.npmrc-logged --flat --dot && npx --yes npm-cli-login -u verdaccio -p verdaccio -e [email protected] -r http://127.0.0.1:4873 --config-path \".verdaccio/conf/.npmrc-logged\"",
45-
"verdaccio:prepare-publish": "yarn verdaccio:clean && yarn set:version 999.0.$(node -e 'process.stdout.write(String(Date.now()))') --include \"!**/!(dist)/package.json\" --include !package.json && yarn verdaccio:login && replace-in-files --regex=\"private(.*)true\" --replacement=private\\$1false '**/dist/package.json' && yarn nx run-many --target=prepare-publish --exclude-task-dependencies",
46-
"verdaccio:publish": "yarn run verdaccio:prepare-publish && yarn nx run-many --target=publish --nx-bail --userconfig \".verdaccio/conf/.npmrc-logged\" --tag=latest --@o3r:registry=http://127.0.0.1:4873 --@ama-sdk:registry=http://127.0.0.1:4873 --@ama-terasu:registry=http://127.0.0.1:4873 --@o3r-training:registry=http://127.0.0.1:4873 --@ama-mfe:registry=http://127.0.0.1:4873 --@ama-styling:registry=http://127.0.0.1:4873 --@ama-mcp:registry=http://127.0.0.1:4873",
44+
"verdaccio:prepare-publish": "yarn verdaccio:clean && yarn verdaccio:login",
45+
"verdaccio:publish": "yarn run verdaccio:prepare-publish && yarn nx run-many --target=publish --nx-bail --set-public --set-version=999.0.$(node -e 'process.stdout.write(String(Date.now()))') --userconfig \".verdaccio/conf/.npmrc-logged\" --tag=latest --@o3r:registry=http://127.0.0.1:4873 --@ama-sdk:registry=http://127.0.0.1:4873 --@ama-terasu:registry=http://127.0.0.1:4873 --@o3r-training:registry=http://127.0.0.1:4873 --@ama-mfe:registry=http://127.0.0.1:4873 --@ama-styling:registry=http://127.0.0.1:4873 --@ama-mcp:registry=http://127.0.0.1:4873",
4746
"verdaccio:stop": "docker container stop $(docker ps -a -q --filter=\"name=verdaccio\")",
4847
"verdaccio:all": "yarn verdaccio:stop && yarn verdaccio:start && yarn verdaccio:publish",
4948
"watch:vscode-extension": "yarn nx run vscode-extension:compile:watch",

packages/@ama-mcp/angular/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"test": {},
2020
"lint": {},
2121
"prepare-publish": {},
22+
"set-version": {},
2223
"publish": {}
2324
},
2425
"tags": []

packages/@ama-mcp/core/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"test": {},
2020
"lint": {},
2121
"prepare-publish": {},
22+
"set-version": {},
2223
"publish": {}
2324
},
2425
"tags": []

packages/@ama-mcp/github/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"test": {},
2020
"lint": {},
2121
"prepare-publish": {},
22+
"set-version": {},
2223
"publish": {}
2324
},
2425
"tags": []

packages/@ama-mcp/otter/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"test": {},
2020
"lint": {},
2121
"prepare-publish": {},
22+
"set-version": {},
2223
"publish": {}
2324
},
2425
"tags": []

packages/@ama-mfe/messages/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
}
3737
},
3838
"prepare-publish": {},
39+
"set-version": {},
3940
"publish": {},
4041
"documentation": {}
4142
},

0 commit comments

Comments
 (0)