From 0d34c2a10bab1c50ec774aeb56ee5a82d78c2d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Wed, 17 Jun 2020 10:41:05 +0200
Subject: [PATCH] first rule evaluated to never, switched that

---
 .gitlab/CI/publish.gitlab-ci.yml | 2 +-
 .gitlab/CI/release.yml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml
index 1885f2a284..c61ac974af 100644
--- a/.gitlab/CI/publish.gitlab-ci.yml
+++ b/.gitlab/CI/publish.gitlab-ci.yml
@@ -5,9 +5,9 @@
   tags:
     - veloren-docker
   rules:
-    - when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: always
+    - when: never
 
 docker:
   extends: .publish
diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml
index efddd5e6e5..5f0dfc86ea 100644
--- a/.gitlab/CI/release.yml
+++ b/.gitlab/CI/release.yml
@@ -4,10 +4,10 @@
   tags:
     - veloren-docker
   rules:
-    - when: manual
-      allow_failure: true
     - if: $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ || $CI_PIPELINE_SOURCE == "schedule"
       when: never
+    - when: manual
+      allow_failure: true
 
 # Template to only run if pushes to master or a tag happened
 .release: