From 5b2a5696e229df5d7e35cf0f7630f432aac2e623 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 24 Mar 2022 18:31:54 -0500
Subject: [PATCH] Minor ci-support cleanups
---
.github/workflows/ci.yml | 9 ++++-----
.gitlab-ci.yml | 6 ++----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 15098225..7040e651 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,8 +31,8 @@ jobs:
- name: "Main Script"
run: |
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
- . ci-support.sh
+ curl -L -O https://tiker.net/ci-support-v0
+ . ci-support-v0
build_py_project_in_conda_env
build_docs
@@ -55,7 +55,6 @@ jobs:
- uses: actions/checkout@v2
- name: "Main Script"
run: |
- CONDA_ENVIRONMENT=.test-conda-env-py3.yml
curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
. ./build-and-test-py-project-within-miniconda.sh
@@ -68,8 +67,8 @@ jobs:
run: |
grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml
CONDA_ENVIRONMENT=.test-conda-env.yml
- curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
- . ci-support.sh
+ curl -L -O https://tiker.net/ci-support-v0
+ . ci-support-v0
EXTRA_INSTALL="pyvisfile scipy"
build_py_project_in_conda_env
run_examples
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4de8d0c0..0df37358 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,6 @@ Pytest Conda:
- export SUMPY_NO_CACHE=1
- export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine
- export PYOPENCL_TEST=portable:pthread
- - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
- ". ./build-and-test-py-project-within-miniconda.sh"
tags:
@@ -81,7 +80,6 @@ Pytest POCL Titan V:
- export SUMPY_NO_CACHE=1
- export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine
- export PYOPENCL_TEST=portable:titan
- - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
- ". ./build-and-test-py-project-within-miniconda.sh"
tags:
@@ -97,8 +95,8 @@ Examples Conda:
script: |
grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml
CONDA_ENVIRONMENT=.test-conda-env.yml
- curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
- . ci-support.sh
+ curl -L -O https://tiker.net/ci-support-v0
+ . ci-support-v0
EXTRA_INSTALL="pyvisfile scipy"
build_py_project_in_conda_env
run_examples
--
GitLab