From 215101ebebb60ecf3b009ea1f98a4e4dd2fae87b Mon Sep 17 00:00:00 2001
From: Tamas Gal <himself@tamasgal.com>
Date: Wed, 31 Mar 2021 12:42:51 +0200
Subject: [PATCH] Adapt CI
---
.gitlab-ci.yml | 7 -------
scripts/get_jpp.sh | 9 ---------
2 files changed, 16 deletions(-)
delete mode 100755 scripts/get_jpp.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a705a1..e7c307c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,9 +19,6 @@ stages:
source venv/bin/activate
JPP_DIR=jpp pip install .
-.dependencies_template: &dependencies_template |
- ./scripts/get_jpp.sh
-
.test_template: &test_definition |
source venv/bin/activate
pip install -U pytest
@@ -51,7 +48,6 @@ build-jpp-master-py35:
stage: build
script:
- echo "CI_COMMIT_REF_SLUG = $CI_COMMIT_REF_SLUG"
- - *dependencies_template
- *virtualenv_definition
cache:
paths:
@@ -65,7 +61,6 @@ build-jpp-master-py36:
image: docker.km3net.de/base/python:3.6
stage: build
script:
- - *dependencies_template
- *virtualenv_definition
cache:
paths:
@@ -79,7 +74,6 @@ build-jpp-master-py37:
image: docker.km3net.de/base/python:3.7
stage: build
script:
- - *dependencies_template
- *virtualenv_definition
cache:
paths:
@@ -93,7 +87,6 @@ build-jpp-master-py38:
image: docker.km3net.de/base/python:3.8
stage: build
script:
- - *dependencies_template
- *virtualenv_definition
cache:
paths:
diff --git a/scripts/get_jpp.sh b/scripts/get_jpp.sh
deleted file mode 100755
index 1a30554..0000000
--- a/scripts/get_jpp.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-if [ ! -d 'jpp' ]; then
- echo "Cloning Jpp..."
- git clone --depth 1 https://$KM3NET_USERNAME:$KM3NET_PASSWORD@git.km3net.de/common/jpp.git
-else
- echo "Fetching latest master"
- cd jpp
- git pull
-fi
--
GitLab