Pipeline · ReactWeb5 / CivWeb

feat: 地图库版本更新

3 jobs from master in 47 seconds (queued for 38 seconds)

Status	Job ID	Name
Install
failed	#141709 civ_base allowed to fail manual	install	00:05 Mar 21, 2022

Package
failed	#141710 civ_base allowed to fail manual	package	00:04 Mar 21, 2022

Push
failed	#141711 civ_base allowed to fail manual	push	00:37 Mar 21, 2022

	Name	Stage
failed	push	Push
	`Your branch is up to date with 'origin/map'. It took 2.11 seconds to enumerate untracked files. 'status -uno' may speed it up, but you have to be careful not to forget to add new files yourself (see 'git help status'). nothing to commit, working tree clean section_end:1647860698:step_script section_start:1647860698:cleanup_file_variables Cleaning up project directory and file based variables section_end:1647860698:cleanup_file_variables ERROR: Job failed: exit status 1`
failed	package	Package
	`From https://g.civnet.cn:8443/ReactWeb5/CivWeb * branch master -> FETCH_HEAD Updating f036cc0..17b448d error: Your local changes to the following files would be overwritten by merge: package-lock.json Please commit your changes or stash them before you merge. Aborting section_end:1647860657:step_script section_start:1647860657:cleanup_file_variables Cleaning up project directory and file based variables section_end:1647860658:cleanup_file_variables ERROR: Job failed: exit status 1`
failed	install	Install
	`From https://g.civnet.cn:8443/ReactWeb5/CivWeb * branch master -> FETCH_HEAD Updating f036cc0..17b448d error: Your local changes to the following files would be overwritten by merge: package-lock.json Please commit your changes or stash them before you merge. Aborting section_end:1647860650:step_script section_start:1647860650:cleanup_file_variables Cleaning up project directory and file based variables section_end:1647860651:cleanup_file_variables ERROR: Job failed: exit status 1`