From 797337ab4a59de480370c3a28de806bfc18bc4be Mon Sep 17 00:00:00 2001
From: "[6~" <inform@tiker.net>
Date: Thu, 2 Apr 2020 19:09:06 -0500
Subject: [PATCH] [Github CI] Add hook for package configuration after conda
env creation
---
.conda-ci-build-configure.sh | 1 +
.github/workflows/ci.yml | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
create mode 100644 .conda-ci-build-configure.sh
diff --git a/.conda-ci-build-configure.sh b/.conda-ci-build-configure.sh
new file mode 100644
index 00000000..80a2fb77
--- /dev/null
+++ b/.conda-ci-build-configure.sh
@@ -0,0 +1 @@
+python ./configure.py --cl-inc-dir="$CONDA_PREFIX/include" --cl-lib-dir="$CONDA_PREFIX/lib"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bfc85049..e55999a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,6 @@ jobs:
sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .test-conda-env-py2.yml
CONDA_ENVIRONMENT=.test-conda-env-py2.yml
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
- python ./configure.py --cl-inc-dir="$CONDA_PREFIX/include" --cl-lib-dir="$CONDA_PREFIX/lib"
. ./build-and-test-py-project-within-miniconda.sh
pytest3:
@@ -46,7 +45,6 @@ jobs:
run: |
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
- python ./configure.py --cl-inc-dir="$CONDA_PREFIX/include" --cl-lib-dir="$CONDA_PREFIX/lib"
. ./build-and-test-py-project-within-miniconda.sh
# vim: sw=4
--
GitLab