Merge branch 'theo/reset_branch_after_artifacts_download' into 'master'

ci: bump gitlab-ci-files ref, do not clean when resetting branch See merge request TankerHQ/sdk-rust!40
TankerHQ · Jun 17, 2021 · 4a5fbaa · 4a5fbaa
2 parents 7d59cae + 4a89897
commit 4a5fbaa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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,