diff options
| author | louiz’ <louiz@louiz.org> | 2017-08-02 22:06:45 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-08-02 22:08:42 +0200 |
| commit | 97b52526c5a661ea9fc5c5e1ae5ea300c54e19d2 (patch) | |
| tree | 4447cc09e26e53dfffcf9f337881a62e741e83cb | |
| parent | cad70ba453a7877b64c0f23a4b4f34db9d1a0957 (diff) | |
| download | biboumi-97b52526c5a661ea9fc5c5e1ae5ea300c54e19d2.tar.gz biboumi-97b52526c5a661ea9fc5c5e1ae5ea300c54e19d2.tar.bz2 biboumi-97b52526c5a661ea9fc5c5e1ae5ea300c54e19d2.tar.xz biboumi-97b52526c5a661ea9fc5c5e1ae5ea300c54e19d2.zip | |
ci: debian branch, pull the debian branch before trying to merge with master
| -rw-r--r-- | .gitlab-ci.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f63b8c6..eeb4375 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -292,6 +292,7 @@ packaging:deb: before_script: [] script: - git checkout debian + - git pull - git merge --no-commit --no-ff master - mk-build-deps - apt update -y |