From ae599031c102cf301b088a87a37f59ffe9eb81d7 Mon Sep 17 00:00:00 2001
From: Chunwei <yanchunwei@baidu.com>
Date: Sat, 15 Jun 2019 11:03:15 +0000
Subject: [PATCH] enhance gitlab

---
 .gitlab-ci.yml | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6f900a4d14..01dc6463267 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,13 +13,17 @@ check:prebuilt:
         - lite
     stage: ci
     script:
-        #- pip3 install pre-commit
-        #- alias python=python3
         - rm -rf ~/.pip
         - pip install pre-commit
         - pre-commit install
+
+        # merge the latest code
+        - git config --global user.email "you@example.com"
+        - git config --global user.name "Your Name"
+        - git fetch origin incubate/lite
+        - git merge --no-ff origin/incubate/lite
+
         - ./paddle/fluid/lite/tools/build.sh check_style
-        #- ./paddle/fluid/lite/tools/build.sh check_need_ci
     cache:
         key: check_style
         paths:
@@ -37,10 +41,15 @@ build:server:
             - /root/.ccache
     script:
         - apt install ccache
-        - export http_proxy=http://172.19.57.45:3128
-        - export https_proxy=http://172.19.57.45:3128
-        #- export http_proxy=http://agent.baidu.com:8118
-        #- export https_proxy=http://agent.baidu.com:8118
+        - export http_proxy=$CI_PROXY
+        - export https_proxy=$CI_PROXY
+
+        # merge the latest code
+        - git config --global user.email "you@example.com"
+        - git config --global user.name "Your Name"
+        - git fetch origin incubate/lite
+        - git merge --no-ff origin/incubate/lite
+
         - mkdir -p build
         - cd build
         - ../paddle/fluid/lite/tools/build.sh cmake_x86
@@ -67,8 +76,15 @@ build:mobile:
             - /root/.ccache
     script:
         - apt install ccache
-        - export http_proxy=http://172.19.57.45:3128
-        - export https_proxy=http://172.19.57.45:3128
+        - export http_proxy=$CI_PROXY
+        - export https_proxy=$CI_PROXY
+
+        # merge the latest code
+        - git config --global user.email "you@example.com"
+        - git config --global user.name "Your Name"
+        - git fetch origin incubate/lite
+        - git merge --no-ff origin/incubate/lite
+
         - ./paddle/fluid/lite/tools/build.sh build_test_arm
     dependencies:
         - build:server
-- 
GitLab