From ac25e27718ce4c71f48ca5c6e0cdbe38e4134ea4 Mon Sep 17 00:00:00 2001
From: Forest <wizcardforest@gmail.com>
Date: Mon, 13 May 2019 09:45:21 -0400
Subject: [PATCH 1/2] Always pull LFS

Former-commit-id: 37f76cd968ad778e4e259cca9390e7b10179795d
---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b865a9084..3caba428c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,10 +28,10 @@ before_script:
   - if [ ! -z "${SOURCE_PROJECT}" -a "${SOURCE_PROJECT}" != " " ]; then
       echo "THIS SEEMS TO BE A MERGE PIPELINE FROM ${SOURCE_PROJECT}/${SOURCE_BRANCH}";
       git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}";
-      git lfs install;
-      git lfs fetch;
-      git lfs checkout;
     fi;
+  - git lfs install;
+  - git lfs fetch;
+  - git lfs checkout;
   - git status
   - if [ -d target ]; then
       ls -la target;
@@ -125,6 +125,7 @@ clippy:
   only:
     refs:
       - master
+      - fix-lfs-assets
 
 commit:linux-debug:
   <<: *commit

From 3333987fcbd471b60b208b321e017baf8b7666db Mon Sep 17 00:00:00 2001
From: Forest <wizcardforest@gmail.com>
Date: Mon, 13 May 2019 10:43:06 -0400
Subject: [PATCH 2/2] Only push on master

Former-commit-id: a252869ed2e3c6779411c8f571acf413de173a78
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3caba428c8..398e93b29b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,7 +125,6 @@ clippy:
   only:
     refs:
       - master
-      - fix-lfs-assets
 
 commit:linux-debug:
   <<: *commit