Skip to content

Commit a1b9945

Browse files
committed
feat: set-version at publish task
1 parent ee00567 commit a1b9945

File tree

65 files changed

+118
-15
lines changed

Some content is hidden

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

65 files changed

+118
-15
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,14 @@ jobs:
7777
with:
7878
#TODO Remove when migrate to Node 24
7979
npm-version: '11.5'
80-
- run: yarn set:version ${{ inputs.version }}
8180
- name: Get tag name
8281
id: get-npm-tag
8382
uses: ./tools/github-actions/get-npm-tag
8483
with:
8584
is-prerelease: ${{ inputs.prerelease }}
8685
version: ${{ inputs.version }}
8786
- name: Publish
88-
run: yarn run publish --tag=${{ inputs.isPullRequest && 'pr' || steps.get-npm-tag.outputs.tag }} ${{ inputs.isPullRequest && '--userconfig=./.npmrc.pr' || ''}}
87+
run: yarn run publish --set-version=${{ inputs.version }} --tag=${{ inputs.isPullRequest && 'pr' || steps.get-npm-tag.outputs.tag }} ${{ inputs.isPullRequest && '--userconfig=./.npmrc.pr' || ''}}
8988
env:
9089
GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9190
AZURE_AUTH_TOKEN: ${{ secrets.AZURE_AUTH_TOKEN }}
@@ -139,10 +138,9 @@ jobs:
139138
- uses: ./tools/github-actions/download-build-output
140139
- uses: ./tools/github-actions/setup
141140
timeout-minutes: 30
142-
- run: yarn set:version ${{ inputs.version }}
143141
- name: Publish Extensions
144142
if: '!inputs.prerelease'
145-
run: yarn run publish:extensions
143+
run: yarn run publish:extensions --set-version=${{ inputs.version }}
146144
env:
147145
NX_BASE: HEAD~1
148146
VSCE_PAT: ${{ secrets.AZURE_VSC_EXT_TOKEN }}

apps/chrome-devtools/project.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@
161161
"{projectRoot}/src/options.html"
162162
]
163163
},
164+
"set-version": {},
165+
"prepare-publish": {},
164166
"publish-extension": {
165167
"executor": "nx:run-script",
166168
"options": {

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: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,35 @@
267267
"outputs": [],
268268
"inputs": [
269269
"{projectRoot}/dist"
270+
],
271+
"dependsOn": [
272+
"prepare-publish",
273+
{
274+
"projects": "self",
275+
"target": "set-version",
276+
"params": "forward"
277+
}
278+
]
279+
},
280+
"set-version": {
281+
"cache": false,
282+
"executor": "nx:run-commands",
283+
"options": {
284+
"cwd": "{workspaceRoot}",
285+
"command": "O3R_SET_PUBLIC='{args.set-public}' yarn o3r-set-version {args.set-version} --placeholder=0.0.0-placeholder --include='{projectRoot}/dist/package.json' --include='{projectRoot}/dist/manifest.json'",
286+
"forwardAllArgs": false
287+
},
288+
"inputs": [
289+
"{projectRoot}/dist/package.json",
290+
"{projectRoot}/dist/manifest.json"
291+
],
292+
"outputs": [
293+
"{projectRoot}/dist/package.json",
294+
"{projectRoot}/dist/manifest.json"
295+
],
296+
"dependsOn": [
297+
"build",
298+
"prepare-publish"
270299
]
271300
},
272301
"prepare-publish": {
@@ -296,7 +325,15 @@
296325
]
297326
},
298327
"publish-extension": {
299-
"cache": false
328+
"cache": false,
329+
"dependsOn": [
330+
"prepare-publish",
331+
{
332+
"projects": "self",
333+
"target": "set-version",
334+
"params": "forward"
335+
}
336+
]
300337
},
301338
"build": {
302339
"dependsOn": [
@@ -644,7 +681,7 @@
644681
"libsDir": "packages",
645682
"appsDir": "apps"
646683
},
647-
"useDaemonProcess": false,
684+
"useDaemonProcess": true,
648685
"cacheDirectory": ".cache/nx",
649686
"nxCloudId": "63e6951e043da20dd8321aec"
650687
}

package.json

Lines changed: 5 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,7 @@
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'",
33+
"set:version": "yarn nx run-many --target=set-version",
3434
"harmonize:version": "eslint --quiet --fix $(git ls-files \":(glob)**/package.json\" .yarnrc.yml)",
3535
"doc:packages": "yarn nx run-many --target=documentation",
3636
"doc:root": "yarn prepare-doc-root-menu-template && yarn update-doc-summary ./docs && yarn compodoc",
@@ -42,8 +42,8 @@
4242
"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",
4343
"verdaccio:clean": "rimraf -g \".verdaccio/storage/@{o3r,ama-sdk,ama-terasu,ama-mfe,ama-styling,o3r-training,ama-mcp}\"",
4444
"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",
45+
"verdaccio:prepare-publish": "yarn verdaccio:clean && yarn verdaccio:login",
46+
"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",
4747
"verdaccio:stop": "docker container stop $(docker ps -a -q --filter=\"name=verdaccio\")",
4848
"verdaccio:all": "yarn verdaccio:stop && yarn verdaccio:start && yarn verdaccio:publish",
4949
"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)