Skip to content
This repository has been archived by the owner on Jun 7, 2021. It is now read-only.

Add RH7 supported flag to build & test on additional OS #1565

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion core/sqf/build-scripts/build.branch
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if [[ "$USE_GIT" == "1" ]];then
# runs make with a detached HEAD then change the space in "(no branch)"
# to an underscore so it can be used.
if [ -z "$ZUUL_BRANCH" ]; then
branch=$(git branch --no-color| grep '^\* ' | sed 's/(no branch)/no_branch/' | awk '{print $2}')
branch=$(git branch --no-color| grep '^\* ' | sed -e 's/(no branch)/no_branch/' -e 's/(detached .*)/no_branch/' | awk '{print $2}')
else
branch=$ZUUL_BRANCH;
fi
Expand Down
2 changes: 2 additions & 0 deletions core/sqf/conf/install_features
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ export CDH_5_7_SUPPORT="Y"
export APACHE_1_0_X_SUPPORT="Y"
export APACHE_1_1_X_SUPPORT="Y"
export APACHE_1_2_X_SUPPORT="Y"

export REDHAT_7_SUPPORT="Y"