Skip to content

Commit 91f6c83

Browse files
authored
Merge branch 'next' into m-to-next
2 parents 5c03216 + 3a6d6aa commit 91f6c83

File tree

104 files changed

+25496
-119782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+25496
-119782
lines changed

.github/workflows/check-build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111

1212
runs-on: ubuntu-latest
1313

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

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Use Node.js ${{ matrix.node-version }}
22-
uses: actions/setup-node@v3
22+
uses: actions/setup-node@v4
2323
with:
2424
node-version: ${{ matrix.node-version }}
2525
- name: Run build
@@ -29,7 +29,7 @@ jobs:
2929
cd dist
3030
npm pack
3131
- name: Upload dist
32-
uses: actions/upload-artifact@v3
32+
uses: actions/upload-artifact@v4
3333
with:
3434
name: dist
3535
path: dist/carbon-components-angular-0.0.0.tgz
@@ -43,17 +43,17 @@ jobs:
4343
# We use Node v20 for building since it is current lts. Node v16 is no longer supported in Angular 17.
4444
strategy:
4545
matrix:
46-
angular-version: [14, 15, 16, 17, 18]
46+
angular-version: [18]
4747
node-version: [20.x]
4848

4949
steps:
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5151
- name: Use Node.js ${{ matrix.node-version }}
52-
uses: actions/setup-node@v3
52+
uses: actions/setup-node@v4
5353
with:
5454
node-version: ${{ matrix.node-version }}
5555
- name: Download dist
56-
uses: actions/download-artifact@v3
56+
uses: actions/download-artifact@v4
5757
with:
5858
name: dist
5959
- run: |

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
- name: Checkout
2828
uses: actions/checkout@v3
2929

30-
# Set up node to use v18
30+
# Set up node to use v20
3131
- name: Setup Node
3232
uses: actions/setup-node@v3
3333
with:
34-
node-version: "18"
34+
node-version: "20"
3535
cache: "npm"
3636
cache-dependency-path: "package-lock.json"
3737

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
node-version: [16.x]
16+
node-version: [20.x]
1717

1818
steps:
1919
- uses: actions/checkout@v3

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16
1+
v20

angular.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,6 @@
7676
}
7777
}
7878
}
79-
},
80-
"carbon-components-angular-e2e": {
81-
"root": "e2e",
82-
"sourceRoot": "e2e",
83-
"projectType": "application",
84-
"architect": {
85-
"e2e": {
86-
"builder": "@angular-devkit/build-angular:protractor",
87-
"options": {
88-
"protractorConfig": "./protractor.conf.js",
89-
"devServerTarget": "carbon-components-angular:serve"
90-
}
91-
}
92-
}
9379
}
9480
},
9581
"schematics": {

integration/ng14/.browserslistrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

integration/ng14/.editorconfig

Lines changed: 0 additions & 16 deletions
This file was deleted.

integration/ng14/.gitignore

Lines changed: 0 additions & 42 deletions
This file was deleted.

integration/ng14/README.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

integration/ng14/angular.json

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)