about summary refs log tree commit diff
path: root/.ci
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2019-08-14 11:52:18 +0100
committeradisbladis <adisbladis@gmail.com>2019-08-14 11:52:18 +0100
commit2624d1eaa6c13cd17dee6362c92724967378ee10 (patch)
tree830c8fbfb739097407246232633c0736bb9f654e /.ci
parentf3f6432ff0eb7377e1bb721c64b93078dfe76f15 (diff)
downloadnixlib-2624d1eaa6c13cd17dee6362c92724967378ee10.tar
nixlib-2624d1eaa6c13cd17dee6362c92724967378ee10.tar.gz
nixlib-2624d1eaa6c13cd17dee6362c92724967378ee10.tar.bz2
nixlib-2624d1eaa6c13cd17dee6362c92724967378ee10.tar.lz
nixlib-2624d1eaa6c13cd17dee6362c92724967378ee10.tar.xz
nixlib-2624d1eaa6c13cd17dee6362c92724967378ee10.tar.zst
nixlib-2624d1eaa6c13cd17dee6362c92724967378ee10.zip
Try to rebase first
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/cron1
1 files changed, 1 insertions, 0 deletions
diff --git a/.ci/cron b/.ci/cron
index 2d6a87843509..a3c4746f110a 100755
--- a/.ci/cron
+++ b/.ci/cron
@@ -4,6 +4,7 @@ set -exuo pipefail
 
 git checkout master
 git reset --hard origin/master
+git pull --rebase origin master
 
 export NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz