Skip to content
Snippets Groups Projects
Commit 78a88dea authored by Nico's avatar Nico
Browse files

ci: pull again before pushing

Sometimes, there are untracked files left in the dl directory, which
another job already commited in the DL cache. git pull will then fail
becaue it won't overwrite untracked files.

By first pulling (which will fail), then commiting and pulling again we
will avoid this situation.
parent b840551a
No related branches found
No related tags found
No related merge requests found
Pipeline #1257 failed
...@@ -33,8 +33,9 @@ default: ...@@ -33,8 +33,9 @@ default:
- git config --global user.name "FFS Buildbot" - git config --global user.name "FFS Buildbot"
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- cat gitlab-known-hosts >> ~/.ssh/known_hosts - cat gitlab-known-hosts >> ~/.ssh/known_hosts
- cd gluon/openwrt/dl && git pull && git add . && git commit -m "update DL cache" || true - cd gluon/openwrt/dl && git pull
- git push || true - git add . && git commit -m "update DL cache" || true
- git pull && git push || true
generate_date: generate_date:
stage: generate_date stage: generate_date
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment