From 136366dfdc807ef45d82c7c1b52d5eca998a1b50 Mon Sep 17 00:00:00 2001
From: Nico <github@nicoboehr.de>
Date: Sat, 9 Sep 2023 06:39:24 +0000
Subject: [PATCH] ci: specify how to fixup conflicts when pulling dl cache
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdedd5639..d11e23b2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ default:
- mkdir -p ~/.ssh
- cat gitlab-known-hosts >> ~/.ssh/known_hosts
- test -d ffs-openwrt-dl-cache || git clone ssh://git@ssh.gitlab.freifunk-stuttgart.de:22220/firmware/ffs-openwrt-dl-cache.git
- - git -C ffs-openwrt-dl-cache pull || true
+ - git -C ffs-openwrt-dl-cache pull --no-rebase || true
- rm -rf gluon/openwrt/dl && mkdir -p gluon/openwrt && ln -s ../../ffs-openwrt-dl-cache gluon/openwrt/dl
- rm -rf gluon/openwrt/staging_dir && mkdir -p staging_dir && ln -s ../../staging_dir gluon/openwrt/staging_dir
after_script:
@@ -34,9 +34,9 @@ default:
- mkdir -p ~/.ssh
- cat gitlab-known-hosts >> ~/.ssh/known_hosts
- cd gluon/openwrt/dl
- - git pull || true
+ - git pull --no-rebase || true
- git add . && git commit -m "update DL cache" || true
- - git pull && git push || true
+ - git pull --no-rebase && git push || true
generate_date:
stage: generate_date
--
GitLab