Skip to content

Commit

Permalink
Merge branch 'next' into m-to-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Akshat55 authored Nov 30, 2024
2 parents 5c03216 + 3a6d6aa commit 91f6c83
Show file tree
Hide file tree
Showing 104 changed files with 25,496 additions and 119,782 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/check-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:

runs-on: ubuntu-latest

# We use Node v18 for building since CCA@v5 is using Angular 14.
# We use Node v20 for building since CCA@v5 is using Angular 17.
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Run build
Expand All @@ -29,7 +29,7 @@ jobs:
cd dist
npm pack
- name: Upload dist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dist
path: dist/carbon-components-angular-0.0.0.tgz
Expand All @@ -43,17 +43,17 @@ jobs:
# We use Node v20 for building since it is current lts. Node v16 is no longer supported in Angular 17.
strategy:
matrix:
angular-version: [14, 15, 16, 17, 18]
angular-version: [18]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Download dist
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist
- run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

# Set up node to use v18
# Set up node to use v20
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "18"
node-version: "20"
cache: "npm"
cache-dependency-path: "package-lock.json"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16
v20
14 changes: 0 additions & 14 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,6 @@
}
}
}
},
"carbon-components-angular-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "carbon-components-angular:serve"
}
}
}
}
},
"schematics": {
Expand Down
17 changes: 0 additions & 17 deletions integration/ng14/.browserslistrc

This file was deleted.

16 changes: 0 additions & 16 deletions integration/ng14/.editorconfig

This file was deleted.

42 changes: 0 additions & 42 deletions integration/ng14/.gitignore

This file was deleted.

27 changes: 0 additions & 27 deletions integration/ng14/README.md

This file was deleted.

114 changes: 0 additions & 114 deletions integration/ng14/angular.json

This file was deleted.

44 changes: 0 additions & 44 deletions integration/ng14/karma.conf.js

This file was deleted.

Loading

0 comments on commit 91f6c83

Please sign in to comment.