Merge pull request #954 from crazy-max/update-node20
chore: node 20 as default runtime
This commit is contained in:
		
						commit
						04d1a3b049
					
				
							
								
								
									
										3
									
								
								.eslintignore
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.eslintignore
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,3 @@ | |||||||
|  | /dist/** | ||||||
|  | /coverage/** | ||||||
|  | /node_modules/** | ||||||
| @ -1,11 +1,12 @@ | |||||||
| { | { | ||||||
|   "env": { |   "env": { | ||||||
|     "node": true, |     "node": true, | ||||||
|     "es2021": true, |     "es6": true, | ||||||
|     "jest": true |     "jest": true | ||||||
|   }, |   }, | ||||||
|   "extends": [ |   "extends": [ | ||||||
|     "eslint:recommended", |     "eslint:recommended", | ||||||
|  |     "plugin:@typescript-eslint/eslint-recommended", | ||||||
|     "plugin:@typescript-eslint/recommended", |     "plugin:@typescript-eslint/recommended", | ||||||
|     "plugin:jest/recommended", |     "plugin:jest/recommended", | ||||||
|     "plugin:prettier/recommended" |     "plugin:prettier/recommended" | ||||||
|  | |||||||
| @ -112,6 +112,6 @@ outputs: | |||||||
|     description: 'Build result metadata' |     description: 'Build result metadata' | ||||||
| 
 | 
 | ||||||
| runs: | runs: | ||||||
|   using: 'node16' |   using: 'node20' | ||||||
|   main: 'dist/index.js' |   main: 'dist/index.js' | ||||||
|   post: 'dist/index.js' |   post: 'dist/index.js' | ||||||
|  | |||||||
| @ -1,8 +1,6 @@ | |||||||
| # syntax=docker/dockerfile:1 | # syntax=docker/dockerfile:1 | ||||||
| 
 | 
 | ||||||
| ARG NODE_VERSION=16 | ARG NODE_VERSION=20 | ||||||
| ARG DOCKER_VERSION=20.10.13 |  | ||||||
| ARG BUILDX_VERSION=0.8.0 |  | ||||||
| 
 | 
 | ||||||
| FROM node:${NODE_VERSION}-alpine AS base | FROM node:${NODE_VERSION}-alpine AS base | ||||||
| RUN apk add --no-cache cpio findutils git | RUN apk add --no-cache cpio findutils git | ||||||
| @ -62,15 +60,10 @@ RUN --mount=type=bind,target=.,rw \ | |||||||
|   --mount=type=cache,target=/src/node_modules \ |   --mount=type=cache,target=/src/node_modules \ | ||||||
|   yarn run lint |   yarn run lint | ||||||
| 
 | 
 | ||||||
| FROM docker:${DOCKER_VERSION} as docker |  | ||||||
| FROM docker/buildx-bin:${BUILDX_VERSION} as buildx |  | ||||||
| 
 |  | ||||||
| FROM deps AS test | FROM deps AS test | ||||||
| RUN --mount=type=bind,target=.,rw \ | RUN --mount=type=bind,target=.,rw \ | ||||||
|   --mount=type=cache,target=/src/node_modules \ |   --mount=type=cache,target=/src/node_modules \ | ||||||
|   --mount=type=bind,from=docker,source=/usr/local/bin/docker,target=/usr/bin/docker \ |   yarn run test --coverage --coverageDirectory=/tmp/coverage | ||||||
|   --mount=type=bind,from=buildx,source=/buildx,target=/usr/libexec/docker/cli-plugins/docker-buildx \ |  | ||||||
|   yarn run test --coverageDirectory=/tmp/coverage |  | ||||||
| 
 | 
 | ||||||
| FROM scratch AS test-coverage | FROM scratch AS test-coverage | ||||||
| COPY --from=test /tmp/coverage / | COPY --from=test /tmp/coverage / | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										44
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										44
									
								
								package.json
									
									
									
									
									
								
							| @ -4,9 +4,13 @@ | |||||||
|   "main": "lib/main.js", |   "main": "lib/main.js", | ||||||
|   "scripts": { |   "scripts": { | ||||||
|     "build": "ncc build src/main.ts --source-map --minify --license licenses.txt", |     "build": "ncc build src/main.ts --source-map --minify --license licenses.txt", | ||||||
|     "lint": "eslint src/**/*.ts __tests__/**/*.ts", |     "lint": "yarn run prettier && yarn run eslint", | ||||||
|     "format": "eslint --fix src/**/*.ts __tests__/**/*.ts", |     "format": "yarn run prettier:fix && yarn run eslint:fix", | ||||||
|     "test": "jest --coverage", |     "eslint": "eslint --max-warnings=0 .", | ||||||
|  |     "eslint:fix": "eslint --fix .", | ||||||
|  |     "prettier": "prettier --check \"./**/*.ts\"", | ||||||
|  |     "prettier:fix": "prettier --write \"./**/*.ts\"", | ||||||
|  |     "test": "jest", | ||||||
|     "all": "yarn run build && yarn run format && yarn test" |     "all": "yarn run build && yarn run format && yarn test" | ||||||
|   }, |   }, | ||||||
|   "repository": { |   "repository": { | ||||||
| @ -19,33 +23,27 @@ | |||||||
|     "build", |     "build", | ||||||
|     "push" |     "push" | ||||||
|   ], |   ], | ||||||
|   "author": "Docker", |   "author": "Docker Inc.", | ||||||
|   "contributors": [ |  | ||||||
|     { |  | ||||||
|       "name": "CrazyMax", |  | ||||||
|       "url": "https://crazymax.dev" |  | ||||||
|     } |  | ||||||
|   ], |  | ||||||
|   "license": "Apache-2.0", |   "license": "Apache-2.0", | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@actions/core": "^1.10.0", |     "@actions/core": "^1.10.0", | ||||||
|     "@docker/actions-toolkit": "^0.8.0", |     "@docker/actions-toolkit": "^0.12.0", | ||||||
|     "handlebars": "^4.7.7" |     "handlebars": "^4.7.7" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@types/csv-parse": "^1.2.2", |     "@types/csv-parse": "^1.2.2", | ||||||
|     "@types/node": "^16.18.21", |     "@types/node": "^20.5.9", | ||||||
|     "@typescript-eslint/eslint-plugin": "^5.56.0", |     "@typescript-eslint/eslint-plugin": "^6.6.0", | ||||||
|     "@typescript-eslint/parser": "^5.56.0", |     "@typescript-eslint/parser": "^6.6.0", | ||||||
|     "@vercel/ncc": "^0.36.1", |     "@vercel/ncc": "^0.38.0", | ||||||
|     "eslint": "^8.36.0", |     "eslint": "^8.48.0", | ||||||
|     "eslint-config-prettier": "^8.8.0", |     "eslint-config-prettier": "^9.0.0", | ||||||
|     "eslint-plugin-jest": "^27.2.1", |     "eslint-plugin-jest": "^27.2.3", | ||||||
|     "eslint-plugin-prettier": "^4.2.1", |     "eslint-plugin-prettier": "^5.0.0", | ||||||
|     "jest": "^29.5.0", |     "jest": "^29.6.4", | ||||||
|     "prettier": "^2.8.7", |     "prettier": "^3.0.3", | ||||||
|     "ts-jest": "^29.0.5", |     "ts-jest": "^29.1.1", | ||||||
|     "ts-node": "^10.9.1", |     "ts-node": "^10.9.1", | ||||||
|     "typescript": "^4.9.5" |     "typescript": "^5.2.2" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -48,7 +48,7 @@ actionsToolkit.run( | |||||||
|       if (dockerConfig && dockerConfig.proxies) { |       if (dockerConfig && dockerConfig.proxies) { | ||||||
|         for (const host in dockerConfig.proxies) { |         for (const host in dockerConfig.proxies) { | ||||||
|           let prefix = ''; |           let prefix = ''; | ||||||
|           if (dockerConfig.proxies.length > 1) { |           if (Object.keys(dockerConfig.proxies).length > 1) { | ||||||
|             prefix = '  '; |             prefix = '  '; | ||||||
|             core.info(host); |             core.info(host); | ||||||
|           } |           } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 CrazyMax
						CrazyMax