From 65f4f14f626c40f2d63cb039318dd06cbbba90bb Mon Sep 17 00:00:00 2001
From: Dmitriy Safronov <zimniy@cyberbrain.pw>
Date: Thu, 22 Apr 2021 01:53:16 +0300
Subject: [PATCH] .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 271d327..142d089 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,11 +55,11 @@ sync:
     GIT_STRATEGY: "none"
   only:
     variables:
-      - $GIT_PUSH_URL =~ /^\S+$/ && $GIT_PUSH_BRANCH =~ /^\S+$/ && (($GIT_PUSH_LOGIN =~ /^\S+$/ && $GIT_PUSH_PASSWORD =~ /^\S+$/) || $SSH_PULL_PRIVATE_KEY=~ /^\S+$/) && $GIT_PULL_URL =~ /^\S+$/ && $GIT_PULL_BRANCH =~ /^\S+$/
+      - $GIT_PUSH_URL =~ /^\S+$/ && $GIT_PUSH_BRANCH =~ /^\S+$/ && ($GIT_PUSH_PASSWORD =~ /^\S+$/ || $SSH_PULL_PRIVATE_KEY=~ /^\S+$/) && $GIT_PULL_URL =~ /^\S+$/ && $GIT_PULL_BRANCH =~ /^\S+$/
   before_script:
     - git config --global credential.helper store && touch ~/.git-credentials
-    - ( test -n "${GIT_PULL_LOGIN}" && test -n "${GIT_PULL_PASSWORD}" ) && echo "https://${GIT_PULL_LOGIN}:${GIT_PULL_PASSWORD}@$(echo ${GIT_PULL_URL} | sed -r 's#([^/])/[^/].*#\1#' | sed -e 's|https://||g')" >> ~/.git-credentials || true
-    - ( test -n "${GIT_PUSH_LOGIN}" && test -n "${GIT_PUSH_PASSWORD}" ) && echo "https://${GIT_PUSH_LOGIN}:${GIT_PUSH_PASSWORD}@$(echo ${GIT_PUSH_URL} | sed -r 's#([^/])/[^/].*#\1#' | sed -e 's|https://||g')" >> ~/.git-credentials || true
+    - test -n "${GIT_PULL_PASSWORD}" && echo "https://${GIT_PULL_LOGIN:-oauth2}:${GIT_PULL_PASSWORD}@$(echo ${GIT_PULL_URL} | sed -r 's#([^/])/[^/].*#\1#' | sed -e 's|https://||g')" >> ~/.git-credentials || true
+    - test -n "${GIT_PUSH_PASSWORD}" && echo "https://${GIT_PUSH_LOGIN:-oauth2}:${GIT_PUSH_PASSWORD}@$(echo ${GIT_PUSH_URL} | sed -r 's#([^/])/[^/].*#\1#' | sed -e 's|https://||g')" >> ~/.git-credentials || true
     - ( eval $(ssh-agent -s); echo "${SSH_PULL_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null && mkdir -p ~/.ssh && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config ) || true
     - ( eval $(ssh-agent -s); echo "${SSH_PUSH_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null && mkdir -p ~/.ssh && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config ) || true
   script:
-- 
GitLab