Skip to content

Commit

Permalink
Merge pull request #1003 from contentstack/staging
Browse files Browse the repository at this point in the history
Main <- Staging
  • Loading branch information
abhinav-from-contentstack authored Aug 29, 2023
2 parents d5a4127 + 2b24712 commit 2191827
Show file tree
Hide file tree
Showing 29 changed files with 2,156 additions and 273 deletions.
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

0 comments on commit 2191827

Please sign in to comment.