Skip to content

Commit ad22eb8

Browse files
simlusimlu
authored
Merge pull request #1842 from blackflux/dev
[Gally]: master <- dev
2 parents 610ae84 + 9e94a28 commit ad22eb8

File tree

34 files changed

+219
-219
lines changed

34 files changed

+219
-219
lines changed

‎src/plugin/tasks/circleci/snippets/serverless/config.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ workflows:
22
node-multi-build:
33
jobs:
44
- gally
5-
- test-node-v18x:
5+
- test-node-v20x:
66
requires:
77
- gally
8-
- test-node-v18x-lib:
8+
- test-node-v20x-lib:
99
requires:
1010
- gally
11-
- test-node-v20:
11+
- test-node-v22:
1212
requires:
1313
- gally
1414
- deploy-local:
@@ -35,12 +35,12 @@ version: 2.1
3535
jobs:
3636
gally:
3737
${file(^/jobs/gally.yml)}
38-
test-node-v18x:
39-
${file(^/jobs/test.yml), image=public.ecr.aws/sam/build-nodejs18.x}
40-
test-node-v18x-lib:
41-
${file(^/jobs/lib-test.yml), image=public.ecr.aws/sam/build-nodejs18.x}
42-
test-node-v20:
43-
${file(^/jobs/test.yml), image=cimg/node:20.11}
38+
test-node-v20x:
39+
${file(^/jobs/test.yml), image=public.ecr.aws/sam/build-nodejs20.x}
40+
test-node-v20x-lib:
41+
${file(^/jobs/lib-test.yml), image=public.ecr.aws/sam/build-nodejs20.x}
42+
test-node-v22:
43+
${file(^/jobs/test.yml), image=cimg/node:22.13}
4444
deploy-local:
4545
${file(^/jobs/deploy.yml), env=local}
4646
deploy-dev:

‎src/plugin/tasks/circleci/snippets/serverless/jobs/deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
docker:
2-
- image: 'public.ecr.aws/sam/build-nodejs20.x'
2+
- image: 'public.ecr.aws/sam/build-nodejs22.x'
33
<<<:
44
- ${file(^/steps/base.yml)}
55
- steps:

‎src/plugin/tasks/circleci/snippets/serverless/workflow/filter.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
requires:
22
- gally
3-
- test-node-v18x
4-
- test-node-v18x-lib
5-
- test-node-v20
3+
- test-node-v20x
4+
- test-node-v20x-lib
5+
- test-node-v22
66
filters:
77
branches:
88
only:

‎src/plugin/tasks/circleci/two-branch-os.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
{
1616
"name": "run-yarn-tests-os",
1717
"variables": {
18-
"jobName": "test-node-v18",
19-
"dockerImage": "cimg/node:18.19",
18+
"jobName": "test-node-v20",
19+
"dockerImage": "cimg/node:20.18",
2020
"jobOptions": {
2121
"requires": [
2222
"gally-create-pr"
@@ -27,8 +27,8 @@
2727
{
2828
"name": "run-yarn-tests-os",
2929
"variables": {
30-
"jobName": "test-node-v21",
31-
"dockerImage": "cimg/node:21.6",
30+
"jobName": "test-node-v23",
31+
"dockerImage": "cimg/node:23.6",
3232
"jobOptions": {
3333
"requires": [
3434
"gally-create-pr"
@@ -39,8 +39,8 @@
3939
{
4040
"name": "run-yarn-tests-os",
4141
"variables": {
42-
"jobName": "test-node-v20",
43-
"dockerImage": "cimg/node:20.11",
42+
"jobName": "test-node-v22",
43+
"dockerImage": "cimg/node:22.13",
4444
"jobOptions": {
4545
"requires": [
4646
"gally-create-pr"
@@ -52,13 +52,13 @@
5252
"name": "dependabot-auto-approve",
5353
"variables": {
5454
"jobName": "gally-auto-approve",
55-
"dockerImage": "cimg/node:20.11",
55+
"dockerImage": "cimg/node:22.13",
5656
"jobOptions": {
5757
"requires": [
5858
"gally-create-pr",
59-
"test-node-v18",
60-
"test-node-v21",
61-
"test-node-v20"
59+
"test-node-v20",
60+
"test-node-v23",
61+
"test-node-v22"
6262
],
6363
"filters": {
6464
"branches": {
@@ -76,9 +76,9 @@
7676
"jobOptions": {
7777
"requires": [
7878
"gally-create-pr",
79-
"test-node-v18",
80-
"test-node-v21",
81-
"test-node-v20"
79+
"test-node-v20",
80+
"test-node-v23",
81+
"test-node-v22"
8282
],
8383
"filters": {
8484
"branches": {

‎src/plugin/tasks/circleci/two-branch.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
{
1616
"name": "run-yarn-tests",
1717
"variables": {
18-
"jobName": "test-node-v18",
19-
"dockerImage": "cimg/node:18.19",
18+
"jobName": "test-node-v20",
19+
"dockerImage": "cimg/node:20.18",
2020
"jobOptions": {
2121
"requires": [
2222
"gally-create-pr"
@@ -27,8 +27,8 @@
2727
{
2828
"name": "run-yarn-tests",
2929
"variables": {
30-
"jobName": "test-node-v21",
31-
"dockerImage": "cimg/node:21.6",
30+
"jobName": "test-node-v23",
31+
"dockerImage": "cimg/node:23.6",
3232
"jobOptions": {
3333
"requires": [
3434
"gally-create-pr"
@@ -39,8 +39,8 @@
3939
{
4040
"name": "run-yarn-tests",
4141
"variables": {
42-
"jobName": "test-node-v20",
43-
"dockerImage": "cimg/node:20.11",
42+
"jobName": "test-node-v22",
43+
"dockerImage": "cimg/node:22.13",
4444
"jobOptions": {
4545
"requires": [
4646
"gally-create-pr"
@@ -56,9 +56,9 @@
5656
"jobOptions": {
5757
"requires": [
5858
"gally-create-pr",
59-
"test-node-v18",
60-
"test-node-v21",
61-
"test-node-v20"
59+
"test-node-v20",
60+
"test-node-v23",
61+
"test-node-v22"
6262
],
6363
"filters": {
6464
"branches": {
@@ -72,13 +72,13 @@
7272
"name": "semantic-release",
7373
"variables": {
7474
"jobName": "release",
75-
"dockerImage": "cimg/node:20.11",
75+
"dockerImage": "cimg/node:22.13",
7676
"jobOptions": {
7777
"requires": [
7878
"gally-create-pr",
79-
"test-node-v18",
80-
"test-node-v21",
81-
"test-node-v20"
79+
"test-node-v20",
80+
"test-node-v23",
81+
"test-node-v22"
8282
],
8383
"filters": {
8484
"branches": {

‎src/plugin/tasks/docker/snippets/dynamo-testing/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/sam/build-nodejs18.x
1+
FROM public.ecr.aws/sam/build-nodejs20.x
22

33
WORKDIR /user
44

‎src/plugin/tasks/docker/snippets/os/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/sam/build-nodejs18.x
1+
FROM public.ecr.aws/sam/build-nodejs20.x
22

33
WORKDIR /user
44

‎src/plugin/tasks/docker/snippets/sls-dynamodb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/sam/build-nodejs18.x
1+
FROM public.ecr.aws/sam/build-nodejs20.x
22

33
WORKDIR /user
44

‎src/plugin/tasks/docker/snippets/sls-react/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/sam/build-nodejs18.x
1+
FROM public.ecr.aws/sam/build-nodejs20.x
22

33
WORKDIR /user
44

‎src/plugin/tasks/docker/snippets/sls/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/sam/build-nodejs18.x
1+
FROM public.ecr.aws/sam/build-nodejs20.x
22

33
WORKDIR /user
44

‎src/plugin/tasks/gally/snippets/serverless.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
"contexts": [
4848
"ci/circleci: deploy-local",
4949
"ci/circleci: deploy-dev",
50-
"ci/circleci: test-node-v18x",
51-
"ci/circleci: test-node-v18x-lib",
52-
"ci/circleci: test-node-v20"
50+
"ci/circleci: test-node-v20x",
51+
"ci/circleci: test-node-v20x-lib",
52+
"ci/circleci: test-node-v22"
5353
]
5454
}
5555
},
@@ -58,19 +58,19 @@
5858
"required_status_checks": {
5959
"contexts": [
6060
"ci/circleci: deploy-stage",
61-
"ci/circleci: test-node-v18x",
62-
"ci/circleci: test-node-v18x-lib",
63-
"ci/circleci: test-node-v20"
61+
"ci/circleci: test-node-v20x",
62+
"ci/circleci: test-node-v20x-lib",
63+
"ci/circleci: test-node-v22"
6464
]
6565
}
6666
},
6767
"$full": {
6868
"required_status_checks": {
6969
"strict": false,
7070
"contexts": [
71-
"ci/circleci: test-node-v18x",
72-
"ci/circleci: test-node-v18x-lib",
73-
"ci/circleci: test-node-v20"
71+
"ci/circleci: test-node-v20x",
72+
"ci/circleci: test-node-v20x-lib",
73+
"ci/circleci: test-node-v22"
7474
]
7575
},
7676
"enforce_admins": false,

‎src/plugin/tasks/gally/two-branch.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
],
1919
"requiredStatusChecks": [
2020
"ci/circleci: gally-create-pr",
21-
"ci/circleci: test-node-v18",
22-
"ci/circleci: test-node-v21",
23-
"ci/circleci: test-node-v20"
21+
"ci/circleci: test-node-v20",
22+
"ci/circleci: test-node-v23",
23+
"ci/circleci: test-node-v22"
2424
],
2525
"requiredReviewCount": 1
2626
}

‎src/plugin/tasks/serverless/snippets/serverless/.base/resolver.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ service: "${projectName}-${opt:stack}"
33
provider:
44
name: aws
55
endpointType: ${slsEndpointType}
6-
runtime: nodejs18.x
6+
runtime: nodejs20.x
77
architecture: arm64
88
memorySize: 256
99
timeout: 8

‎test/projects/assorted/@docker-lambda/docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/sam/build-nodejs18.x
1+
FROM public.ecr.aws/sam/build-nodejs20.x
22

33
WORKDIR /user
44

‎test/projects/assorted/@dynamo-testing/docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/sam/build-nodejs18.x
1+
FROM public.ecr.aws/sam/build-nodejs20.x
22

33
WORKDIR /user
44

‎test/projects/assorted/@npm-closedsource/.circleci/config.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@ workflows:
22
node-multi-build:
33
jobs:
44
- gally-create-pr
5-
- test-node-v18:
5+
- test-node-v20:
66
requires:
77
- gally-create-pr
8-
- test-node-v21:
8+
- test-node-v23:
99
requires:
1010
- gally-create-pr
11-
- test-node-v20:
11+
- test-node-v22:
1212
requires:
1313
- gally-create-pr
1414
- gally-auto-approve:
1515
requires:
1616
- gally-create-pr
17-
- test-node-v18
18-
- test-node-v21
1917
- test-node-v20
18+
- test-node-v23
19+
- test-node-v22
2020
filters:
2121
branches:
2222
only: /dependabot\/.*/
2323
- release:
2424
requires:
2525
- gally-create-pr
26-
- test-node-v18
27-
- test-node-v21
2826
- test-node-v20
27+
- test-node-v23
28+
- test-node-v22
2929
filters:
3030
branches:
3131
only: master
@@ -59,7 +59,7 @@ jobs:
5959
"base.ref=dev&state=open&user.login=dependabot-preview[bot]"
6060
release:
6161
docker:
62-
- image: cimg/node:20.11
62+
- image: cimg/node:22.13
6363
steps:
6464
- checkout
6565
- run:
@@ -87,9 +87,9 @@ jobs:
8787
- ~/.cache/yarn
8888
- run: yarn global add "semantic-release@^19.0.5"
8989
- run: yarn run semantic-release
90-
test-node-v18:
90+
test-node-v20:
9191
docker:
92-
- image: cimg/node:18.19
92+
- image: cimg/node:20.18
9393
steps:
9494
- checkout
9595
- run:
@@ -119,9 +119,9 @@ jobs:
119119
- run: >-
120120
(git add . && git diff-index --quiet HEAD --) || (git status && exit
121121
1);
122-
test-node-v20:
122+
test-node-v22:
123123
docker:
124-
- image: cimg/node:20.11
124+
- image: cimg/node:22.13
125125
steps:
126126
- checkout
127127
- run:
@@ -151,9 +151,9 @@ jobs:
151151
- run: >-
152152
(git add . && git diff-index --quiet HEAD --) || (git status && exit
153153
1);
154-
test-node-v21:
154+
test-node-v23:
155155
docker:
156-
- image: cimg/node:21.6
156+
- image: cimg/node:23.6
157157
steps:
158158
- checkout
159159
- run:

‎test/projects/assorted/@npm-closedsource/.gally.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"strict": true,
2424
"contexts": [
2525
"ci/circleci: gally-create-pr",
26-
"ci/circleci: test-node-v18",
27-
"ci/circleci: test-node-v21",
28-
"ci/circleci: test-node-v20"
26+
"ci/circleci: test-node-v20",
27+
"ci/circleci: test-node-v23",
28+
"ci/circleci: test-node-v22"
2929
]
3030
},
3131
"enforce_admins": false,

0 commit comments

Comments
 (0)