Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #1001

Merged
merged 50 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
9671e4e
Modified workflows to use the latest version of the github actions
cs-raj Jul 13, 2023
c8fe0b0
Resolved the error in yaml
cs-raj Jul 13, 2023
dbe8694
update merge flow
Jul 17, 2023
8aba058
Merge branch 'development' into feat/CS-39612
cs-raj Jul 25, 2023
344f876
Merge branch 'development' into feat/CS-39612
cs-raj Jul 25, 2023
ec1e5ae
Removed secrets-scan
cs-raj Jul 25, 2023
63d93de
update migration scripts with reference logic
Jul 28, 2023
da5dbb9
Merge branch 'development' into feat/CS-37813-entry-exp-updates
Jul 28, 2023
e611efc
Merge branch 'development' into feat/CS-37812-entry-exp-updates
netrajpatel Aug 1, 2023
8b39cc0
fix: migration command(undefined reading length) issue
aman19K Aug 4, 2023
7fb43f3
Merge branch 'development' into feat/CS-37812-entry-exp-updates
netrajpatel Aug 7, 2023
955c988
Added the publish time in the publish_details colum, Version Bump, au…
cs-raj Aug 7, 2023
1dde369
Minor Version Update
cs-raj Aug 7, 2023
32bf4a9
Removed stray console.log
cs-raj Aug 7, 2023
7ffadd7
Merge branch 'development' into feat/CS-37812-entry-exp-updates
aman19K Aug 17, 2023
3690091
Merge pull request #916 from contentstack/feat/CS-37812-entry-exp-upd…
aman19K Aug 17, 2023
8c2688d
Fix: Workflow stage UID remains same after export and import of stack
antonyagustine Aug 17, 2023
b6177bd
Merge branch 'development' into bugfix/CS-40537
antonyagustine Aug 17, 2023
e8484db
Fix: Update next available stages uid on workflow
antonyagustine Aug 18, 2023
f15c4be
Merge branch 'bugfix/CS-40537' of https://github.com/contentstack/cli…
antonyagustine Aug 18, 2023
bcf97af
Merge branch 'development' into feat/CS-40466
cs-raj Aug 18, 2023
0015e29
Merged development and correct minor version update
cs-raj Aug 18, 2023
1bb0f45
feat: asset migration script
aman19K Aug 18, 2023
398fb77
Fix: Workflows typescript type definition fixes
antonyagustine Aug 18, 2023
23af231
Merge pull request #968 from contentstack/feat/CS-40466
cs-raj Aug 18, 2023
1f45c3b
Merge branch 'development' into bugfix/CS-40537
abhinav-from-contentstack Aug 18, 2023
3a3d04b
Merge pull request #986 from contentstack/bugfix/CS-40537
antonyagustine Aug 18, 2023
84ac315
Merge branch 'development' into 40719
netrajpatel Aug 21, 2023
26566f1
Merge branch 'development' into feat/CS-39612
cs-raj Aug 22, 2023
58cd850
Merge pull request #970 from contentstack/40719
cs-raj Aug 22, 2023
2b34d2d
Merge branch 'development' into feat/CS-39612
cs-raj Aug 22, 2023
5f42153
Merge pull request #913 from contentstack/feat/CS-39612
cs-raj Aug 22, 2023
3f8fc66
fix: entries modified script
aman19K Aug 22, 2023
d52ffc1
fix: asset fetch is not a function issue
aman19K Aug 22, 2023
82398fc
fix: entry valid file upload issue
aman19K Aug 23, 2023
8175914
fix: json rte field
aman19K Aug 23, 2023
2dfda62
fix: global field reference issue
aman19K Aug 23, 2023
73ca7b6
fix: json rte ref issue
aman19K Aug 23, 2023
ed433e4
Merge branch 'development' into feat/CS-39927
aman19K Aug 24, 2023
d5a4127
Merge pull request #996 from contentstack/staging
abhinav-from-contentstack Aug 24, 2023
67287c2
fix: ctSchema is not iterable
aman19K Aug 24, 2023
2ed217c
Merge branch 'staging' into merge/CS-40858
abhinav-from-contentstack Aug 24, 2023
0fe862c
Merge branch 'main' into merge/CS-40858
abhinav-from-contentstack Aug 24, 2023
175f365
Merge pull request #1000 from contentstack/merge/CS-40858
abhinav-from-contentstack Aug 24, 2023
2f702cf
Merge branch 'development' into feat/CS-39927
aman19K Aug 24, 2023
7902522
Merge pull request #987 from contentstack/feat/CS-39927
aman19K Aug 24, 2023
9b653d0
refactor: version bump
aman19K Aug 24, 2023
2e54fdb
fix: changed ^ to ~
abhinav-from-contentstack Aug 24, 2023
5e12e97
updated lock files and READMEs
abhinav-from-contentstack Aug 24, 2023
fe686de
Merge pull request #1002 from contentstack/refactor/CS-40857-version-…
abhinav-from-contentstack Aug 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v3.5.3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'snyk-bot' || contains(github.event.pull_request.head.ref, 'snyk-fix-') || contains(github.event.pull_request.head.ref, 'snyk-upgrade-')}}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3.5.3
- name: Login into JIRA
uses: atlassian/gajira-login@master
env:
Expand Down
49 changes: 22 additions & 27 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2
- uses: actions/checkout@v3.5.3
- uses: pnpm/action-setup@v2.2.4
with:
version: 7
- uses: actions/setup-node@v1
- uses: actions/setup-node@v3.7.0
with:
node-version: '18.x'
cache: 'pnpm'
Expand All @@ -32,7 +32,7 @@ jobs:
working-directory: ./packages/contentstack-dev-dependencies
run: npm run prepack
- name: Publishing dev dependencies
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.dev-dependencies-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -47,7 +47,7 @@ jobs:
working-directory: ./packages/contentstack-utilities
run: npm run prepack
- name: Publishing utilities
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.utilities-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -62,7 +62,7 @@ jobs:
working-directory: ./packages/contentstack-command
run: npm run prepack
- name: Publishing command
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.command-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -77,7 +77,7 @@ jobs:
working-directory: ./packages/contentstack-config
run: npm run prepack
- name: Publishing config
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.config-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -92,7 +92,7 @@ jobs:
working-directory: ./packages/contentstack-auth
run: npm run prepack
- name: Publishing auth
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.auth-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -107,7 +107,7 @@ jobs:
working-directory: ./packages/contentstack-export
run: npm run prepack
- name: Publishing export
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.export-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -122,7 +122,7 @@ jobs:
working-directory: ./packages/contentstack-import
run: npm run prepack
- name: Publishing import
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.import-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -133,7 +133,7 @@ jobs:
working-directory: ./packages/contentstack-clone
run: npm install
- name: Publishing clone
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.clone-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -144,7 +144,7 @@ jobs:
working-directory: ./packages/contentstack-export-to-csv
run: npm install
- name: Publishing export to csv
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.export-to-csv-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -155,7 +155,7 @@ jobs:
working-directory: ./packages/contentstack-migrate-rte
run: npm install
- name: Publishing migrate rte
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.migrate-rte-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -166,7 +166,7 @@ jobs:
working-directory: ./packages/contentstack-migration
run: npm install
- name: Publishing migration
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.migration-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -181,7 +181,7 @@ jobs:
working-directory: ./packages/contentstack-seed
run: npm run prepack
- name: Publishing seed
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.seed-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -196,7 +196,7 @@ jobs:
working-directory: ./packages/contentstack-bootstrap
run: npm run prepack
- name: Publishing bootstrap
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.bootstrap-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -207,7 +207,7 @@ jobs:
working-directory: ./packages/contentstack-bulk-publish
run: npm install
- name: Publishing bulk publish
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.bulk-publish-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -222,7 +222,7 @@ jobs:
working-directory: ./packages/contentstack-launch
run: npm run prepack
- name: Publishing launch
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.launch-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -238,7 +238,7 @@ jobs:
working-directory: ./packages/contentstack-branches
run: npm run prepack
- name: Publishing branches
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.branches-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
Expand All @@ -251,25 +251,20 @@ jobs:
run: npm install
- name: Publishing core
id: publish-core
uses: JS-DevTools/npm-publish@v1
uses: JS-DevTools/npm-publish@v2.2.1
if: ${{ steps.core-installation.conclusion == 'success' }}
with:
token: ${{ secrets.NPM_TOKEN }}
package: ./packages/contentstack/package.json
- uses: actions/checkout@v2
- uses: actions/checkout@v3.5.3
with:
ref: 'prod-qa-pipeline'
- run: echo ${{ steps.publish-core.outputs.version }} > version.md
- uses: EndBug/add-and-commit@v9
with:
message: 'Released version'
- name: Create Release
uses: actions/create-release@v1
id: create_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: v${{ steps.publish-core.outputs.version }}
release_name: Release ${{ steps.publish-core.outputs.version }}
draft: false # Default value, but nice to set explicitly
prerelease: false # Default value, but nice to set explicitly
run: gh release create v${{ steps.publish-core.outputs.version }} --title "Release ${{ steps.publish-core.outputs.version }}" --generate-notes
4 changes: 2 additions & 2 deletions .github/workflows/sca-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
- uses: pnpm/action-setup@v2
with:
version: 7
- name: Use Node.js 16.x
uses: actions/setup-node@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3.7.0
with:
node-version: '18.x'
cache: 'pnpm'
Expand Down
38 changes: 19 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/contentstack-branches/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-branches/1.0.10 darwin-arm64 node-v20.3.1
@contentstack/cli-cm-branches/1.0.11 darwin-arm64 node-v20.3.1
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-branches/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli-cm-branches",
"description": "Contentstack CLI plugin to do branches operations",
"version": "1.0.10",
"version": "1.0.11",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
Expand Down
Loading