Pipeline · ReactWeb5 / CivWeb

Update .gitlab-ci.yml

3 jobs from master in 4 seconds (queued for 6 seconds)

Status	Job ID	Name
Install
failed	#141805 civ_base allowed to fail manual	install	00:04 Mar 22, 2022

Package
manual	#141806 civ_base allowed to fail manual	package

Push
manual	#141807 civ_base allowed to fail manual	push

Name Stage Failure

	Name	Stage	Failure
failed	install	Install
	`From https://g.civnet.cn:8443/ReactWeb5/CivWeb * branch master -> FETCH_HEAD Updating af49b4e..f42c44c 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:1647915273:step_script section_start:1647915273:cleanup_file_variables Cleaning up project directory and file based variables section_end:1647915274: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 af49b4e..f42c44c
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:1647915273:step_script
section_start:1647915273:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1647915274:cleanup_file_variables
ERROR: Job failed: exit status 1