Skip to content

Allow passing user and branch to downstream #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inducer merged 1 commit into from
Apr 28, 2022
Merged

Allow passing user and branch to downstream #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions ci-support.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,10 @@ function install_ispc()

function prepare_downstream_build()
{
local proj_name="$1"
# NOTE: parses https://github.com/user/repo.git@branch_name
local proj_url="${1%%@*}"
local proj_branch=${1#"${proj_url}@"}
local proj_name=$(basename "$proj_url" .git)

# This is here because PyOpenCL needs to record a config change so
# CL headers are found. It git adds siteconf.py.
Expand All @@ -707,10 +710,10 @@ function prepare_downstream_build()
git commit -a -m "Fake commit to record local changes"
fi

if [[ "$proj_name" = "mirgecom" ]]; then
git clone "https://github.com/illinois-ceesd/$proj_name.git"
if [[ "$proj_branch" != "$proj_url" ]]; then
git clone "$proj_url" --branch "$proj_branch"
else
git clone "https://github.com/inducer/$proj_name.git"
git clone "$proj_url"
fi

cd "$proj_name"
Expand Down Expand Up @@ -747,22 +750,32 @@ function prepare_downstream_build()

function test_downstream()
{
local downstream_proj="$1"
local proj_name="$downstream_proj"
local downstream_url="$1"
local proj_url=""
local test_examples=0

if [[ "$downstream_proj" = *_examples ]]; then
proj_name="${downstream_proj%_examples}"
if [[ "$downstream_url" =~ .*_examples ]]; then
downstream_url="${downstream_url%_examples}"
test_examples=1
fi

prepare_downstream_build "$proj_name"
if [[ "$downstream_url" =~ https://.* ]]; then
proj_url="$downstream_url"
else
if [[ "$downstream_url" == "mirgecom" ]]; then
proj_url="https://github.com/illinois-ceesd/$downstream_url.git"
else
proj_url="https://github.com/inducer/$downstream_url.git"
fi
fi

prepare_downstream_build "$proj_url"
build_py_project_in_conda_env

if [[ "$test_examples" == "0" ]]; then
test_py_project
else
if [[ "$proj_name" = "mirgecom" ]]; then
if [[ "$proj_url" =~ .*mirgecom.* ]]; then
examples/run_examples.sh ./examples
else
run_examples
Expand Down