Commit 4c257929 authored by Philip Chimento's avatar Philip Chimento 🚮

Merge branch 'fixes' into 'master'

Tweaks

Closes #156

See merge request !140
parents e14435c8 5e5b6928
Pipeline #11028 passed with stages
in 46 minutes and 35 seconds
......@@ -73,3 +73,24 @@ function do_Build_JHBuild(){
echo '-- Done --'
cd -
}
function do_Show_Info(){
echo '-----------------------------------------'
echo 'Useful build system information'
echo -n "Processors: "; grep -c ^processor /proc/cpuinfo
grep ^MemTotal /proc/meminfo
id; uname -a
printenv
echo '-----------------------------------------'
cat /etc/*-release
echo '-----------------------------------------'
if [[ ! -z $CC ]]; then
echo 'Compiler version'
$CC --version
echo '-----------------------------------------'
$CC -dM -E -x c /dev/null
echo '-----------------------------------------'
fi
}
......@@ -58,32 +58,11 @@ function do_Build_Package_Dependencies(){
jhbuild build $(jhbuild list "$1" | sed '$d')
}
function do_Show_Info(){
echo '-----------------------------------------'
echo 'Useful build system information'
echo -n "Processors: "; grep -c ^processor /proc/cpuinfo
grep ^MemTotal /proc/meminfo
id; uname -a
printenv
echo '-----------------------------------------'
cat /etc/*-release
echo '-----------------------------------------'
if [[ ! -z $CC ]]; then
echo 'Compiler version'
$CC --version
echo '-----------------------------------------'
$CC -dM -E -x c /dev/null
echo '-----------------------------------------'
fi
}
function do_Get_Upstream_Master(){
if [[ "$CI_BUILD_REF_SLUG" == "master" && "$CI_PROJECT_PATH_SLUG" == "gnome-gjs" ]]; then
if [[ "$CI_PROJECT_PATH_SLUG" == "gnome-gjs" && ("$CI_BUILD_REF_SLUG" == "master" || "$CI_BUILD_REF_SLUG" == "gnome-"*) ]]; then
echo '-----------------------------------------'
echo 'Running against upstream master'
echo 'Running against upstream'
echo "=> $1 Nothing to do"
do_Done
......@@ -155,7 +134,7 @@ echo '-- Environment --'
echo "Running on: $BASE $OS $extra_opts"
echo "Doing: $1"
source test/extra/do_jhbuild.sh
source test/extra/do_environment.sh
do_Create_Artifacts_Folder "$1"
do_Get_Commit_Message
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment