Simplify ci scripts not to depend on snippets any longer

templates/ci-for-cxx-extensions.yml

@@ -27,9 +27,9 @@ variables:
   stage: build
   before_script:
     - git clean -ffdx
-    - curl --silent "https://gitlab.idiap.ch/bob/bob.admin/raw/master/bootstrap-conda.sh" > bootstrap-conda.sh
-    - chmod 755 ./bootstrap-conda.sh
-    - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
+    - curl --silent "https://gitlab.idiap.ch/bob/bob.admin/raw/master/ci/bootstrap.sh" > bootstrap.sh
+    - chmod 755 ./bootstrap.sh
+    - ./bootstrap.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
   variables: &build_variables
     BOB_DOCUMENTATION_SERVER: "http://www.idiap.ch/software/bob/docs/latest/bob/%s/master/"
   script:
@@ -41,7 +41,7 @@ variables:
   artifacts:
     expire_in: 1 day
     paths:
-      - bootstrap-conda.sh
+      - bootstrap.sh
       - dist/
       - sphinx/
 
@@ -69,7 +69,7 @@ variables:
 .test_template: &test_job
   stage: test
   before_script:
-    - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
+    - ./bootstrap.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
     - source ${CONDA_FOLDER}/bin/activate ${CONDA_PREFIX}
     - pip install --use-wheel --no-index --pre dist/*.whl
   script:
@@ -92,10 +92,10 @@ variables:
     - master
     - tags
   before_script:
-    - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/8/raw | tr -d '\r' > upload-wheel.sh
-    - chmod 755 upload-wheel.sh
+    - curl --silent https://gitlab.idiap.ch/bob/bob.admin/raw/master/ci/wheels.sh > wheels.sh
+    - chmod 755 wheels.sh
   script:
-    - ./upload-wheel.sh
+    - ./wheels.sh
 
 
 # Template for (latest) documentation upload stage
@@ -105,10 +105,10 @@ variables:
   only:
     - master
   before_script:
-    - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/9/raw | tr -d '\r' > upload-sphinx.sh
-    - chmod 755 upload-sphinx.sh
+    - curl --silent https://gitlab.idiap.ch/bob/bob.admin/raw/master/ci/docs.sh > docs.sh
+    - chmod 755 docs.sh
   script:
-    - ./upload-sphinx.sh
+    - ./docs.sh
 
 
 # 2) Package specific instructions (you may tune this if needed)
@@ -268,4 +268,4 @@ wheels_macosx_35:
   dependencies:
     - build_macosx_35
   tags:
-    - conda-macosx
\ No newline at end of file
+    - conda-macosx

templates/ci-for-python-only.yml

@@ -27,9 +27,9 @@ variables:
   stage: build
   before_script:
     - git clean -ffdx
-    - curl --silent "https://gitlab.idiap.ch/bob/bob.admin/raw/master/bootstrap-conda.sh" > bootstrap-conda.sh
-    - chmod 755 ./bootstrap-conda.sh
-    - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
+    - curl --silent "https://gitlab.idiap.ch/bob/bob.admin/raw/master/ci/bootstrap.sh" > bootstrap.sh
+    - chmod 755 ./bootstrap.sh
+    - ./bootstrap.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
   variables: &build_variables
     BOB_DOCUMENTATION_SERVER: "http://www.idiap.ch/software/bob/docs/latest/bob/%s/master/"
   script:
@@ -42,7 +42,7 @@ variables:
   artifacts:
     expire_in: 1 day
     paths:
-      - bootstrap-conda.sh
+      - bootstrap.sh
       - dist/
       - sphinx/
 
@@ -70,7 +70,7 @@ variables:
 .test_template: &test_job
   stage: test
   before_script:
-    - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
+    - ./bootstrap.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
     - source ${CONDA_FOLDER}/bin/activate ${CONDA_PREFIX}
     - pip install --use-wheel --no-index --pre dist/*.whl
   script:
@@ -93,10 +93,10 @@ variables:
     - master
     - tags
   before_script:
-    - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/8/raw | tr -d '\r' > upload-wheel.sh
-    - chmod 755 upload-wheel.sh
+    - curl --silent https://gitlab.idiap.ch/bob/bob.admin/raw/master/ci/docs.sh > docs.sh
+    - chmod 755 docs.sh
   script:
-    - ./upload-wheel.sh
+    - ./docs.sh
 
 
 # Template for (latest) documentation upload stage
@@ -105,11 +105,6 @@ variables:
   stage: docs
   only:
     - master
-  before_script:
-    - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/9/raw | tr -d '\r' > upload-sphinx.sh
-    - chmod 755 upload-sphinx.sh
-  script:
-    - ./upload-sphinx.sh
 
 
 # 2) Package specific instructions (you may tune this if needed)
@@ -247,4 +242,4 @@ test_macosx_35:
   dependencies:
     - build_macosx_35
   tags:
-    - conda-macosx
\ No newline at end of file
+    - conda-macosx