Skip to content

Commit 73c0ccf

Browse files
committed
ci: update versions and fixes
1 parent 7ab4e62 commit 73c0ccf

15 files changed

+55
-28
lines changed

static/cicd/docker/github_build_eslint.yml

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

2020
strategy:
2121
matrix:
22-
node-version: [16.x, 18.x]
22+
node-version: [18.x, 20.x]
2323
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2424

2525
steps:

static/cicd/docker/github_build_eslint_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
node-version: [16.x, 18.x]
22+
node-version: [18.x, 20.x]
2323
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2424

2525
steps:
@@ -37,7 +37,7 @@ jobs:
3737

3838
strategy:
3939
matrix:
40-
node-version: [16.x, 18.x]
40+
node-version: [18.x, 20.x]
4141
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
4242

4343
steps:

static/cicd/docker/github_build_test.yml

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

2020
strategy:
2121
matrix:
22-
node-version: [16.x, 18.x]
22+
node-version: [18.x, 20.x]
2323
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2424

2525
steps:

static/cicd/docker/gitlab_build_eslint.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include:
1818
# - template: Code-Quality.gitlab-ci.yml
1919

2020
eslint:
21-
image: node:16-alpine3.16
21+
image: node:18-alpine3.18
2222
####
2323
stage: test
2424
allow_failure: true
@@ -30,6 +30,8 @@ eslint:
3030

3131
Build:
3232
image: docker:20
33+
services:
34+
- name: docker:20-dind
3335
stage: build
3436
retry: 2
3537
needs:
@@ -54,6 +56,8 @@ container_scanning:
5456

5557
Push latest:
5658
image: docker:20
59+
services:
60+
- name: docker:20-dind
5761
variables:
5862
GIT_STRATEGY: none
5963
stage: push
@@ -70,6 +74,8 @@ Push latest:
7074

7175
Push tag:
7276
image: docker:20
77+
services:
78+
- name: docker:20-dind
7379
variables:
7480
GIT_STRATEGY: none
7581
stage: push

static/cicd/docker/gitlab_build_eslint_test.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include:
1818
# - template: Code-Quality.gitlab-ci.yml
1919

2020
eslint:
21-
image: node:16-alpine3.16
21+
image: node:18-alpine3.18
2222
####
2323
stage: test
2424
allow_failure: true
@@ -31,7 +31,7 @@ eslint:
3131
unit-test:
3232
variables:
3333
NODE_ENV: test
34-
image: node:16-alpine3.16
34+
image: node:18-alpine3.18
3535
####
3636
stage: test
3737
retry: 1
@@ -43,13 +43,16 @@ unit-test:
4343
- npm test
4444
artifacts:
4545
reports:
46+
coverage_report:
47+
path: coverage/cobertura-coverage.xml
48+
coverage_format: cobertura
4649
junit:
4750
- test-results.xml
48-
cobertura:
49-
- coverage/cobertura-coverage.xml
5051

5152
Build:
5253
image: docker:20
54+
services:
55+
- name: docker:20-dind
5356
stage: build
5457
retry: 2
5558
needs:
@@ -75,6 +78,8 @@ container_scanning:
7578

7679
Push latest:
7780
image: docker:20
81+
services:
82+
- name: docker:20-dind
7883
variables:
7984
GIT_STRATEGY: none
8085
stage: push
@@ -91,6 +96,8 @@ Push latest:
9196

9297
Push tag:
9398
image: docker:20
99+
services:
100+
- name: docker:20-dind
94101
variables:
95102
GIT_STRATEGY: none
96103
stage: push

static/cicd/docker/gitlab_build_only.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ include:
2020

2121
Build:
2222
image: docker:20
23+
services:
24+
- name: docker:20-dind
2325
stage: build
2426
retry: 2
2527
before_script:
@@ -42,6 +44,8 @@ container_scanning:
4244

4345
Push latest:
4446
image: docker:20
47+
services:
48+
- name: docker:20-dind
4549
variables:
4650
GIT_STRATEGY: none
4751
stage: push
@@ -58,6 +62,8 @@ Push latest:
5862

5963
Push tag:
6064
image: docker:20
65+
services:
66+
- name: docker:20-dind
6167
variables:
6268
GIT_STRATEGY: none
6369
stage: push

static/cicd/docker/gitlab_build_test.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include:
2020
unit-test:
2121
variables:
2222
NODE_ENV: test
23-
image: node:16-alpine3.16
23+
image: node:18-alpine3.18
2424
####
2525
stage: test
2626
retry: 1
@@ -32,13 +32,17 @@ unit-test:
3232
- npm test
3333
artifacts:
3434
reports:
35+
coverage_report:
36+
path: coverage/cobertura-coverage.xml
37+
coverage_format: cobertura
3538
junit:
3639
- test-results.xml
37-
cobertura:
38-
- coverage/cobertura-coverage.xml
40+
3941

4042
Build:
4143
image: docker:20
44+
services:
45+
- name: docker:20-dind
4246
stage: build
4347
retry: 2
4448
needs:
@@ -63,6 +67,8 @@ container_scanning:
6367

6468
Push latest:
6569
image: docker:20
70+
services:
71+
- name: docker:20-dind
6672
variables:
6773
GIT_STRATEGY: none
6874
stage: push
@@ -79,6 +85,8 @@ Push latest:
7985

8086
Push tag:
8187
image: docker:20
88+
services:
89+
- name: docker:20-dind
8290
variables:
8391
GIT_STRATEGY: none
8492
stage: push

static/cicd/npm_package/github_build_eslint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
submodules: recursive
1616
- uses: actions/setup-node@v3
1717
with:
18-
node-version: 16
18+
node-version: 18
1919
- name: Install modules
2020
run: npm ci
2121
- name: Run ESLint
@@ -28,7 +28,7 @@ jobs:
2828
submodules: recursive
2929
- uses: actions/setup-node@v3
3030
with:
31-
node-version: 16
31+
node-version: 18
3232
- run: npm ci
3333
- run: npm run build
3434
- run: npm version prerelease --no-git-tag-version --preid ${{ github.ref_name }}-${{ github.sha }}

static/cicd/npm_package/github_build_eslint_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
submodules: recursive
1616
- uses: actions/setup-node@v3
1717
with:
18-
node-version: 16
18+
node-version: 18
1919
- name: Install modules
2020
run: npm ci
2121
- name: Run ESLint
@@ -28,7 +28,7 @@ jobs:
2828
submodules: recursive
2929
- uses: actions/setup-node@v3
3030
with:
31-
node-version: 16
31+
node-version: 18
3232
- name: Install modules
3333
run: npm ci
3434
- name: Run Tests
@@ -41,7 +41,7 @@ jobs:
4141
submodules: recursive
4242
- uses: actions/setup-node@v3
4343
with:
44-
node-version: 16
44+
node-version: 18
4545
- run: npm ci
4646
- run: npm run build
4747
- run: npm version prerelease --no-git-tag-version --preid ${{ github.ref_name }}-${{ github.sha }}

static/cicd/npm_package/github_build_only.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
submodules: recursive
1616
- uses: actions/setup-node@v3
1717
with:
18-
node-version: 16
18+
node-version: 18
1919
- run: npm ci
2020
- run: npm run build
2121
- run: npm version prerelease --no-git-tag-version --preid ${{ github.ref_name }}-${{ github.sha }}

0 commit comments

Comments
 (0)