aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2019-08-15 07:49:24 +0200
committerAvatar Marvin Schmidt <marv@exherbo.org> 2019-10-22 20:10:52 +0200
commit8df32a39221004a67e930f7d082ab60d7f9cf684 (patch)
tree9bee29df19c2d989d2d06ecbe7fce6da29135955
parentea2d768830f6e6817279cee525874b44efa50bfe (diff)
downloadpaludis-8df32a39221004a67e930f7d082ab60d7f9cf684.tar.gz
paludis-8df32a39221004a67e930f7d082ab60d7f9cf684.tar.xz
ci/configure: Introduce option for python version to use
-rw-r--r--.gitlab-ci.yml6
-rwxr-xr-xci/configure-paludis.sh2
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a4c6c84a..be054ee75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
image: paludis/${DISTRIBUTION}-${COMPILER}:${VERSION}
script:
- mkdir -pv build-obj && cd build-obj
- - ../ci/configure-paludis.sh .. ${DISTRIBUTION} ${COMPILER}
+ - PYTHON_VERSION=${PYTHON_VERSION} ../ci/configure-paludis.sh .. ${DISTRIBUTION} ${COMPILER}
- ninja -j$(nproc) all
artifacts:
paths:
@@ -26,6 +26,7 @@ build:exherbo:
DISTRIBUTION: "exherbo"
COMPILER: "gcc"
VERSION: "latest"
+ PYTHON_VERSION: "3.7"
<<: *build-template
test:exherbo:
@@ -42,6 +43,7 @@ build:exherbo-testing:
DISTRIBUTION: "exherbo"
COMPILER: "gcc"
VERSION: "next"
+ PYTHON_VERSION: "3.7"
allow_failure: true
<<: *build-template
@@ -60,6 +62,7 @@ build:exherbo-clang:
DISTRIBUTION: "exherbo"
COMPILER: "clang"
VERSION: "latest"
+ PYTHON_VERSION: "3.7"
<<: *build-template
test:exherbo-clang:
@@ -77,6 +80,7 @@ build:gentoo:
DISTRIBUTION: "gentoo"
COMPILER: "gcc"
VERSION: "latest"
+ PYTHON_VERSION: "3.6"
<<: *build-template
test:gentoo:
diff --git a/ci/configure-paludis.sh b/ci/configure-paludis.sh
index 161de6920..63b167908 100755
--- a/ci/configure-paludis.sh
+++ b/ci/configure-paludis.sh
@@ -12,6 +12,7 @@ if [[ ${DISTRIBUTION} == "exherbo" ]]; then
-DCONFIG_FRAMEWORK=eclectic
-DRUBY_VERSION:STRING="2.4"
+ -DPYTHON_VERSION:STRING="${PYTHON_VERSION}"
)
elif [[ ${DISTRIBUTION} == "gentoo" ]]; then
myconf+=(
@@ -21,6 +22,7 @@ elif [[ ${DISTRIBUTION} == "gentoo" ]]; then
-DCONFIG_FRAMEWORK=eselect
-DRUBY_VERSION:STRING="2.4"
+ -DPYTHON_VERSION:STRING="${PYTHON_VERSION}"
)
fi