Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75c161d1 authored by Romain Hunault's avatar Romain Hunault 🚴🏻 Committed by Fahim
Browse files

update for test purpose

parent 904cc869
Loading
Loading
Loading
Loading
Loading
+9 −7
Original line number Diff line number Diff line
@@ -25,17 +25,17 @@ build:
  image: registry.gitlab.e.foundation/e/tools/docker-tools:latest
  stage: update-from-upstream
  rules:
    - if: '$CI_PIPELINE_SOURCE =~ /schedule/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'
    - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_REF_NAME == $LOCAL_BRANCH'
  variables:
    CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH
    GIT_STRATEGY: none
  before_script:
    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
    - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
    - eval $(ssh-agent -s)
    - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null
    - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add -
    - mkdir -p ~/.ssh
    - chmod 700 ~/.ssh
    - echo "${SSH_KNOWN_HOSTS}" > /root/.ssh/known_hosts
    - echo "${SSH_KNOWN_HOSTS}" > ~/.ssh/known_hosts
    - echo "${SSH_KNOWN_HOSTS}"
    - chmod 644 ~/.ssh/known_hosts
    - git config --global user.email $GITLAB_USER_EMAIL
@@ -48,9 +48,10 @@ build:
    - git fetch origin
    - git checkout $UPSTREAM_BRANCH
    - git remote add upstream $UPSTREAM_URL
    - git pull upstram $UPSTREAM_DEFAULT_BRANCH
    - git push
    - git checkout --track origin/$CI_DEFAULT_BRANCH
    - git fetch upstream
    - git pull upstream $UPSTREAM_DEFAULT_BRANCH
    - git push --tags
    - git checkout --track origin/$LOCAL_BRANCH
    - git merge $UPSTREAM_BRANCH
    - git push
    - git remote remove upstream
@@ -58,6 +59,7 @@ build:
update-default-branch:
  extends: .update-from-upstream
  variables:
    LOCAL_BRANCH: 4074-add_update_with_upstream_pipeline
    UPSTREAM_BRANCH: upstream/master
    UPSTREAM_DEFAULT_BRANCH: main
    UPSTREAM_URL: https://github.com/k9mail/k-9.git
 No newline at end of file