From c9fdaf13ece28d372d4526752ec421f9024db04e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@ocamlpro.com>
Date: Fri, 25 Nov 2016 23:10:32 +0100
Subject: [PATCH] CI: push `master-expurged` to `tezos/tezos`.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9150cb15b..791f99668 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ stages:
   - build
   - build_test
   - test
+  - expurge
   - publish
   - cleanup
 
@@ -105,15 +106,15 @@ test:data-encoding:
     - build
     - build:test
 
-publish:expurge:
-  stage: publish
+expurge:
+  stage: expurge
   tags:
     - tezos_builder
   only:
     - master@tezos/tezos
   script:
     - echo "${CI_KH}" > ~/.ssh/known_hosts
-    - echo "${CI_PK}" > ~/.ssh/id_rsa
+    - echo "${CI_PK_GITLAB}" > ~/.ssh/id_rsa
     - chmod 400 ~/.ssh/id_rsa
     - rm -fr .git/refs/original
     - git filter-branch --prune-empty --index-filter
@@ -141,14 +142,12 @@ publish:github:
     - tezos_builder
   only:
     - master@tezos/tezos
-  when: manual
   script:
     - echo "${CI_KH}" > ~/.ssh/known_hosts
-    - echo "${CI_PK}" > ~/.ssh/id_rsa
+    - echo "${CI_PK_GITHUB}" > ~/.ssh/id_rsa
     - chmod 400 ~/.ssh/id_rsa
     - git reset ${CI_BUILD_REF}_expurged
-    - git push git@github.com:OCamlPro/tezos.git
-               -f HEAD:master
+    - git push git@github.com:tezos/tezos.git -f HEAD:master
 
 cleanup:
   stage: cleanup