Skip to content

Commit

Permalink
chore: fixed all the conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
abpaul1993 committed Nov 20, 2024
2 parents 825a805 + b03cb19 commit 8b36ce9
Show file tree
Hide file tree
Showing 27 changed files with 1,096 additions and 111 deletions.
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ jobs:

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3

2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
node-version: '20.x'

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
node_modules
Expand Down
240 changes: 240 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,240 @@
name: Test

on: [push, pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
react-jest-test:
name: React Jest test
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- uses: dorny/paths-filter@v3
id: changes
with:
filters: |
react:
- 'packages/react/**'
- name: Increase watchers
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

- name: Use Node.js
uses: actions/setup-node@v4
if: steps.changes.outputs.react == 'true'
with:
node-version: '16.x'

- name: Cache dependencies
uses: actions/cache@v4
if: steps.changes.outputs.react == 'true'
with:
path: |
node_modules
*/*/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
if: steps.changes.outputs.react == 'true'
run: |
yarn --frozen-lockfile
yarn lerna run --stream postinstall
yarn lerna link
- name: Run Jest tests, collect coverage
if: steps.changes.outputs.react == 'true'
run: |
cd packages/react
yarn test:ci --silent
- name: Archive coverage artifacts
if: ${{ success() }} && steps.changes.outputs.react == 'true'
uses: actions/upload-artifact@v4
with:
name: jest-coverage
path: packages/react/jest/coverage/coverage-final.json

react-cypress-test:
name: React Cypress test
runs-on: ubuntu-latest
container:
image: cypress/browsers:node16.14.0-slim-chrome99-ff97
options: --privileged

steps:
- name: Upgrade git
run: |
echo deb "http://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list
apt-get update
apt-get install -y git/buster-backports
- name: Checkout code
uses: actions/checkout@v4

- uses: dorny/paths-filter@v3
id: changes
with:
filters: |
react:
- 'packages/react/**'
- name: Use Node.js
uses: actions/setup-node@v4
if: steps.changes.outputs.react == 'true'
with:
node-version: '16.x'

- name: Install dependencies
if: steps.changes.outputs.react == 'true'
run: |
yarn --frozen-lockfile
yarn lerna run --stream postinstall
yarn lerna link
- name: Cache dependencies
uses: actions/cache@v4
if: steps.changes.outputs.react == 'true'
with:
path: |
node_modules
*/*/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Cache Cypress binary
uses: actions/cache@v4
if: steps.changes.outputs.react == 'true'
with:
path: ~/.cache/Cypress
key: cypress-${{ runner.os }}-cypress-${{ hashFiles('**/yarn.lock') }}

- name: Run Cypress tests, collect coverage
if: steps.changes.outputs.react == 'true'
run: |
cd packages/react
yarn test:e2e:ci
env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
HEIGHT: 900
WIDTH: 1680

- name: Archive visual diff report
if: ${{ failure() }} && steps.changes.outputs.react == 'true'
uses: actions/upload-artifact@v4
with:
name: visual-diff-report
path: |
packages/react/cypress-visual-report
packages/react/cypress-visual-screenshots
- name: Archive coverage artifacts
if: ${{ success() }} && steps.changes.outputs.react == 'true'
uses: actions/upload-artifact@v4
with:
name: cypress-coverage
path: packages/react/cypress/coverage/coverage-final.json

combine-reports:
name: Combine Coverage Reports
runs-on: ubuntu-latest
needs: [react-cypress-test, react-jest-test]

steps:
- name: Checkout code
uses: actions/checkout@v4

- uses: dorny/paths-filter@v3
id: changes
with:
filters: |
react:
- 'packages/react/**'
- name: Use Node.js
uses: actions/setup-node@v4
if: steps.changes.outputs.react == 'true'
with:
node-version: '16.x'

- name: Download all workflow run artifacts
uses: actions/download-artifact@v4
if: steps.changes.outputs.react == 'true'
with:
name: cypress-coverage
path: ~/work/carbon-addons-iot-react/carbon-addons-iot-react/packages/react/cypress/coverage/

- name: Download all workflow run artifacts
uses: actions/download-artifact@v4
if: steps.changes.outputs.react == 'true'
with:
name: jest-coverage
path: ~/work/carbon-addons-iot-react/carbon-addons-iot-react/packages/react/jest/coverage/

- name: Change file paths for cypress coverage report
if: steps.changes.outputs.react == 'true'
run: |
cd packages/react/cypress/coverage
pwd
node ../../../../scripts/change-paths.js
- name: Copy, combine, and report coverage
if: steps.changes.outputs.react == 'true'
run: |
cd packages/react
yarn reports
- name: Coveralls
uses: coverallsapp/github-action@master
if: steps.changes.outputs.react == 'true'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: './packages/react/coverage/lcov.info'
base-path: 'packages/react'

test-angular:
name: Test Angular
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- uses: dorny/paths-filter@v3
id: changes
with:
filters: |
angular:
- 'packages/angular/**'
- name: Use Node.js
uses: actions/setup-node@v4
if: steps.changes.outputs.angular == 'true'
with:
node-version: '16.x'

- name: Cache dependencies
uses: actions/cache@v4
if: steps.changes.outputs.angular == 'true'
with:
path: |
node_modules
*/*/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
if: steps.changes.outputs.angular == 'true'
run: |
yarn --frozen-lockfile
yarn lerna run --stream postinstall
yarn lerna link
- name: Run tests, collect coverage
if: steps.changes.outputs.angular == 'true'
run: |
cd packages/angular
yarn test:ci
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
20
46 changes: 35 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
* color token usage ([0952809](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/09528091d34aa604cc0f6125f15b2a71c9501f17))





# [4.0.0-v4-Carbon11.50](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v4.0.0-v4-Carbon11.49...v4.0.0-v4-Carbon11.50) (2024-11-15)

**Note:** Version bump only for package ibm-ai-applications





# [4.0.0-v4-Carbon11.49](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v4.0.0-v4-Carbon11.48...v4.0.0-v4-Carbon11.49) (2024-11-14)
Expand Down Expand Up @@ -136,12 +129,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

### Bug Fixes

<<<<<<< HEAD
* add maximum data point to data table card ([26d7829](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/26d782926e1bd30cfa5f2d653d029ef28470c2fd))
=======
* date time picker ([#3884](https://github.com/carbon-design-system/carbon-addons-iot-react/issues/3884)) ([d16461c](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/d16461c15af40112865c02d96dd458c65ba8329d))





<<<<<<< HEAD
# [4.0.0-v4-Carbon11.41](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v4.0.0-v4-Carbon11.40...v4.0.0-v4-Carbon11.41) (2024-11-10)

**Note:** Version bump only for package ibm-ai-applications
Expand Down Expand Up @@ -213,43 +206,71 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


# [4.0.0-v4-Carbon11.34](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v4.0.0-v4-Carbon11.33...v4.0.0-v4-Carbon11.34) (2024-10-02)
=======
# [2.154.0-next.35](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.154.0-next.34...v2.154.0-next.35) (2024-10-01)
>>>>>>> next


### Features

<<<<<<< HEAD
* Monaco editor load resources from npm ([#3886](https://github.com/carbon-design-system/carbon-addons-iot-react/issues/3886)) ([6299902](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/6299902869febbecd7b535d2434679e30240258e))
=======
* Support to CodeEditor new lib ([#3887](https://github.com/carbon-design-system/carbon-addons-iot-react/issues/3887)) ([4aee867](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/4aee867aba203cde305bb99ab1959541fa08be8d))
>>>>>>> next





<<<<<<< HEAD
# [4.0.0-v4-Carbon11.33](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v4.0.0-v4-Carbon11.32...v4.0.0-v4-Carbon11.33) (2024-09-25)
=======
# [2.154.0-next.34](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.154.0-next.33...v2.154.0-next.34) (2024-08-16)
>>>>>>> next


### Bug Fixes

<<<<<<< HEAD
* date time picker v2 style ([6edf30b](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/6edf30bf33853eb551073bf48b57073f5dd0d3ca))
=======
* select the inner modal body css ([#3878](https://github.com/carbon-design-system/carbon-addons-iot-react/issues/3878)) ([fe6103e](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/fe6103e998b51327ad989e00831834f0996620f3))
>>>>>>> next





<<<<<<< HEAD
# [4.0.0-v4-Carbon11.32](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v4.0.0-v4-Carbon11.31...v4.0.0-v4-Carbon11.32) (2024-09-06)
=======
# [2.154.0-next.33](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.154.0-next.32...v2.154.0-next.33) (2024-08-09)
>>>>>>> next


### Bug Fixes

<<<<<<< HEAD
* side nav colors added back ([932dc57](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/932dc57d93ab81513e023f6b62a7da3ed8f4814f))
=======
* moving flyout menu var to be scoped to flyout-menu ([#3877](https://github.com/carbon-design-system/carbon-addons-iot-react/issues/3877)) ([2e54d53](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/2e54d538920442943e458d49eed93f0a369b7d1c))
>>>>>>> next





<<<<<<< HEAD
# [4.0.0-v4-Carbon11.31](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v4.0.0-v4-Carbon11.30...v4.0.0-v4-Carbon11.31) (2024-08-30)
=======
# [2.154.0-next.32](https://github.com/carbon-design-system/carbon-addons-iot-react/compare/v2.154.0-next.31...v2.154.0-next.32) (2024-08-01)
>>>>>>> next


### Bug Fixes

<<<<<<< HEAD
* adding missing optional chaining ([d7bd829](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/d7bd8298863e09952b52a2deda6fa5dc293da1e7))


Expand Down Expand Up @@ -605,6 +626,9 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
* add tooltip to the tablecard column ([a7d8d7c](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/a7d8d7cecb8eaa5e199d56c88b73b13238d560b6))
* deploy storybook to github page ([df3f40e](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/df3f40e34b91dbeafe8ca3e8ba154fc22a7332f1))
* override the default behaviour of handledataitemedit ([85ba9e7](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/85ba9e79d2ea6e3b6c3827e4c67e1026e2df4cb2))
=======
* remove last threshold ([#3876](https://github.com/carbon-design-system/carbon-addons-iot-react/issues/3876)) ([35eef3c](https://github.com/carbon-design-system/carbon-addons-iot-react/commit/35eef3c88fa1dedd6c25e0d8eb0d7c532b493d58))
>>>>>>> next



Expand Down
Loading

0 comments on commit 8b36ce9

Please sign in to comment.