Merge branch 'theo/reset_branch_after_artifacts_download' into 'master'

theodelrieu · theodelrieu · commit 4a5fbaadbbea · 2021-06-17T07:27:17.000Z
ci: bump gitlab-ci-files ref, do not clean when resetting branch

See merge request TankerHQ/sdk-rust!40
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 include:
   project: TankerHQ/gitlab-ci-files
   file: /rust.yml
-  ref: 37bb68d38359db981eaec61aa6918075ff29d4e0
+  ref: ecfaa4031b36380595405ca7078f73daf08c6b1b
 
 check/native-from-sources/linux:
   extends:
diff --git a/run-ci.py b/run-ci.py
@@ -321,7 +321,7 @@ def main() -> None:
         ref = tankerci.git.find_ref(
             Path.cwd(), [f"origin/{args.branch}", f"origin/{fallback}"]
         )
-        tankerci.git.reset(Path.cwd(), ref)
+        tankerci.git.reset(Path.cwd(), ref, clean=False)
     elif args.command == "download-artifacts":
         tankerci.gitlab.download_artifacts(
             project_id=args.project_id,

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ def main() -> None:`
`321`	`321`	`ref = tankerci.git.find_ref(`
`322`	`322`	`Path.cwd(), [f"origin/{args.branch}", f"origin/{fallback}"]`
`323`	`323`	`)`
`324`		`- tankerci.git.reset(Path.cwd(), ref)`
	`324`	`+ tankerci.git.reset(Path.cwd(), ref, clean=False)`
`325`	`325`	`elif args.command == "download-artifacts":`
`326`	`326`	`tankerci.gitlab.download_artifacts(`
`327`	`327`	`project_id=args.project_id,`