Skip to content

Commit

Permalink
Merge branch 'develop' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
anthony9187 committed Jul 15, 2022
2 parents 0e8b119 + 445e7f5 commit cb5de15
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
token: ${{secrets.GIT_PUBLISH_TOKEN}}
- uses: actions/setup-node@v2
with:
node-version: 14.17
node-version: 16.16
- run: npm ci
- run: npm run test

Expand All @@ -32,7 +32,7 @@ jobs:
token: ${{secrets.GIT_PUBLISH_TOKEN}}
- uses: actions/setup-node@v2
with:
node-version: 14.17
node-version: 16.16
registry-url: https://registry.npmjs.org/
- run: npm ci
- run: npx semantic-release --no-ci --repository-url [email protected]:rdkcentral/Lightning-UI-Components.git
Expand All @@ -49,10 +49,9 @@ jobs:
token: ${{secrets.GITHUB_TOKEN}}
- uses: actions/setup-node@v2
with:
node-version: 14.17
node-version: 16.16
- run: npm i
- run: npm run build
- run: |
git remote set-url origin https://git:${{secrets.GITHUB_TOKEN}}@github.com/rdkcentral/Lightning-UI-Components.git
npm run gh-pages -- -u "github-actions-bot <[email protected]>"
4 changes: 2 additions & 2 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: pull-request
on:
pull_request:
branches: [ develop ]
branches: [develop]

jobs:
build:
Expand All @@ -10,6 +10,6 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 12
node-version: 16.16
- run: npm install
- run: npm run test
4 changes: 2 additions & 2 deletions .github/workflows/publish-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
token: ${{secrets.GIT_PUBLISH_TOKEN}}
- uses: actions/setup-node@v2
with:
node-version: 14.17
node-version: 16.16
- run: npm ci
- run: npm run test

Expand All @@ -33,7 +33,7 @@ jobs:
token: ${{secrets.GIT_PUBLISH_TOKEN}}
- uses: actions/setup-node@v2
with:
node-version: 14.17
node-version: 16.16
registry-url: https://registry.npmjs.org/
- run: npm ci
- run: npx semantic-release --no-ci --repository-url [email protected]:rdkcentral/Lightning-UI-Components.git
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16
v16.16

0 comments on commit cb5de15

Please sign in to comment.