From 3222ef28e2b1e5712155d2a48f893d3a36fae9d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Mon, 3 May 2021 19:10:57 -0500
Subject: [PATCH] kcv3 downstream grudge CI: Use appropriate branch (#359)
* kcv3 downstream grudge CI: Use appropriate branch
* Debug grudge downstream CI kcv3 clone
* Grudge downstream CI for kcv3: Also for kcv3-grudge-downstream-ci
* kcv3 downstream grudge CI: I hate nested shell conditionals
* kcv3 grudge downstream CI: Use "special grudge" for kcv3 and branches targeting it
---
.github/workflows/ci.yml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e932ef2f..88372caee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -146,7 +146,15 @@ jobs:
env:
DOWNSTREAM_PROJECT: ${{ matrix.downstream_project }}
run: |
- git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git"
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
+ . ./ci-support.sh
+
+ # Use "special grudge" for kcv3 and branches targeting it.
+ if [[ "$DOWNSTREAM_PROJECT" = "grudge" ]] && [[ "$GITHUB_HEAD_REF" = "kernel_callables_v3-edit2" || "$GITHUB_BASE_REF" = "kernel_callables_v3-edit2" ]]; then
+ with_echo git clone "https://github.com/kaushikcfd/$DOWNSTREAM_PROJECT.git" -b "kcv3-e2-compat"
+ else
+ with_echo git clone "https://github.com/inducer/$DOWNSTREAM_PROJECT.git"
+ fi
cd "$DOWNSTREAM_PROJECT"
echo "*** $DOWNSTREAM_PROJECT version: $(git rev-parse --short HEAD)"
@@ -159,8 +167,6 @@ jobs:
sed -i "/mpi4py/ d" requirements.txt
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
- . ./ci-support.sh
build_py_project_in_conda_env
test_py_project
--
GitLab