Skip to content

Commit 657561a

Browse files
Merge branch 'main' into fix/staging-v1.39.0
2 parents c84cb1d + a996c90 commit 657561a

File tree

16 files changed

+1560
-1582
lines changed

16 files changed

+1560
-1582
lines changed

.github/config/release.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
2-
"releaseAll": true,
3-
"plugins": {
4-
"utilities": false,
5-
"command": false,
6-
"config": false,
7-
"auth": false,
8-
"export": false,
9-
"import": true,
10-
"clone": false,
11-
"export-to-csv": false,
12-
"migrate-rte": false,
13-
"migration": false,
14-
"seed": false,
15-
"bootstrap": false,
16-
"bulk-publish": false,
17-
"dev-dependencies": false,
18-
"launch": false,
19-
"branches": false,
20-
"core": false
21-
}
22-
}
2+
"releaseAll": false,
3+
"plugins": {
4+
"utilities": true,
5+
"command": true,
6+
"config": false,
7+
"auth": false,
8+
"export": false,
9+
"import": false,
10+
"clone": false,
11+
"export-to-csv": false,
12+
"migrate-rte": false,
13+
"migration": false,
14+
"seed": false,
15+
"bootstrap": false,
16+
"bulk-publish": false,
17+
"dev-dependencies": false,
18+
"launch": false,
19+
"branches": false,
20+
"core": false
21+
}
22+
}

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,17 @@ jobs:
293293
token: ${{ secrets.NPM_TOKEN }}
294294
package: ./packages/contentstack/package.json
295295
- uses: actions/checkout@v4
296+
if: ${{ steps.publish-core.conclusion == 'success' }}
296297
with:
297298
ref: 'prod-qa-pipeline'
298299
- run: echo ${{ steps.publish-core.outputs.version }} > version.md
300+
if: ${{ steps.publish-core.conclusion == 'success' }}
299301
- uses: EndBug/add-and-commit@v9
302+
if: ${{ steps.publish-core.conclusion == 'success' }}
300303
with:
301304
message: 'Released version'
302305
- name: Create Release
306+
if: ${{ steps.publish-core.conclusion == 'success' }}
303307
id: create_release
304308
env:
305309
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

packages/contentstack-audit/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ $ npm install -g @contentstack/cli-audit
1919
$ csdx COMMAND
2020
running command...
2121
$ csdx (--version|-v)
22+
<<<<<<< HEAD
2223
@contentstack/cli-audit/1.11.0 darwin-arm64 node-v22.14.0
24+
=======
25+
@contentstack/cli-audit/1.10.0 darwin-arm64 node-v22.13.1
26+
>>>>>>> main
2327
$ csdx --help [COMMAND]
2428
USAGE
2529
$ csdx COMMAND

packages/contentstack-auth/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ $ npm install -g @contentstack/cli-auth
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21+
<<<<<<< HEAD
2122
@contentstack/cli-auth/1.4.0 darwin-arm64 node-v22.14.0
23+
=======
24+
@contentstack/cli-auth/1.3.25 darwin-arm64 node-v22.13.1
25+
>>>>>>> main
2226
$ csdx --help [COMMAND]
2327
USAGE
2428
$ csdx COMMAND

packages/contentstack-bootstrap/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ $ npm install -g @contentstack/cli-cm-bootstrap
1515
$ csdx COMMAND
1616
running command...
1717
$ csdx (--version)
18+
<<<<<<< HEAD
1819
@contentstack/cli-cm-bootstrap/1.14.0 darwin-arm64 node-v22.14.0
20+
=======
21+
@contentstack/cli-cm-bootstrap/1.13.3 darwin-arm64 node-v22.13.1
22+
>>>>>>> main
1923
$ csdx --help [COMMAND]
2024
USAGE
2125
$ csdx COMMAND

packages/contentstack-branches/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ $ npm install -g @contentstack/cli-cm-branches
3737
$ csdx COMMAND
3838
running command...
3939
$ csdx (--version)
40+
<<<<<<< HEAD
4041
@contentstack/cli-cm-branches/1.4.0 darwin-arm64 node-v22.14.0
42+
=======
43+
@contentstack/cli-cm-branches/1.3.1 darwin-arm64 node-v22.13.1
44+
>>>>>>> main
4145
$ csdx --help [COMMAND]
4246
USAGE
4347
$ csdx COMMAND

packages/contentstack-bulk-publish/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21+
<<<<<<< HEAD
2122
@contentstack/cli-cm-bulk-publish/1.8.0 darwin-arm64 node-v22.14.0
23+
=======
24+
@contentstack/cli-cm-bulk-publish/1.7.4 darwin-arm64 node-v22.13.1
25+
>>>>>>> main
2226
$ csdx --help [COMMAND]
2327
USAGE
2428
$ csdx COMMAND

packages/contentstack-clone/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ $ npm install -g @contentstack/cli-cm-clone
1616
$ csdx COMMAND
1717
running command...
1818
$ csdx (--version)
19+
<<<<<<< HEAD
1920
@contentstack/cli-cm-clone/1.14.0 darwin-arm64 node-v22.14.0
21+
=======
22+
@contentstack/cli-cm-clone/1.13.3 darwin-arm64 node-v22.13.1
23+
>>>>>>> main
2024
$ csdx --help [COMMAND]
2125
USAGE
2226
$ csdx COMMAND

packages/contentstack-command/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "@contentstack/cli-command",
33
"description": "Contentstack CLI plugin for configuration",
44
"version": "1.4.0",
5+
"version": "1.4.0",
56
"author": "Contentstack",
67
"main": "lib/index.js",
78
"types": "lib/index.d.ts",
@@ -27,6 +28,7 @@
2728
"@types/node": "^14.18.63",
2829
"eslint": "^8.57.1",
2930
"eslint-config-oclif": "^6.0.15",
31+
"eslint-config-oclif": "^6.0.15",
3032
"eslint-config-oclif-typescript": "^3.1.13",
3133
"mocha": "10.8.2",
3234
"nyc": "^15.1.0",

packages/contentstack-config/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ $ npm install -g @contentstack/cli-config
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21+
<<<<<<< HEAD
2122
@contentstack/cli-config/1.11.0 darwin-arm64 node-v22.14.0
23+
=======
24+
@contentstack/cli-config/1.10.1 darwin-arm64 node-v22.13.1
25+
>>>>>>> main
2226
$ csdx --help [COMMAND]
2327
USAGE
2428
$ csdx COMMAND

0 commit comments

Comments
 (0)