[gjs: 1/3] CI: move code to a shared source
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 1/3] CI: move code to a shared source
- Date: Wed, 9 May 2018 05:07:00 +0000 (UTC)
commit d1a3a3adea0a0d1d7e96b500e023262c5892ba2b
Author: Claudio André <claudioandre br gmail com>
Date: Sun May 6 21:55:27 2018 -0300
CI: move code to a shared source
It will be in use in more than one place.
test/extra/{do_jhbuild.sh => do_environment.sh} | 21 +++++++++++++++++++++
test/test-ci.sh | 23 +----------------------
2 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/test/extra/do_jhbuild.sh b/test/extra/do_environment.sh
similarity index 71%
rename from test/extra/do_jhbuild.sh
rename to test/extra/do_environment.sh
index 6d2d0dbf..8ca598bc 100755
--- a/test/extra/do_jhbuild.sh
+++ b/test/extra/do_environment.sh
@@ -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
+}
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 529ef48a..7dc741e2 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -58,27 +58,6 @@ 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
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]