added support for alternate invocation syntax

ros-industrial · Mar 21, 2017 · d1a6c8d · d1a6c8d
1 parent 79eba5e
commit d1a6c8d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -22,6 +22,4 @@ jade:
     PRERELEASE_REPONAME: "std_msgs"
 
 kinetic:
-  script: .ci_config/gitlab.sh
-  variables:
-    ROS_DISTRO: "kinetic"
+  script: .ci_config/gitlab.sh ROS_DISTRO=kinetic # alternate syntax
diff --git a/gitlab.sh b/gitlab.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Copyright (c) 2016, Isaac I. Y. Saito
+# Copyright (c) 2017, Mathias Lüdtke
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,4 +25,4 @@ export TARGET_REPO_PATH=$CI_PROJECT_DIR
 export TARGET_REPO_NAME=$CI_PROJECT_NAME
 export _DO_NOT_FOLD=true
 
-bash $DIR_THIS/industrial_ci/src/ci_main.sh
+env "$@" bash $DIR_THIS/industrial_ci/src/ci_main.sh
diff --git a/travis.sh b/travis.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Copyright (c) 2016, Isaac I. Y. Saito
+# Copyright (c) 2017, Mathias Lüdtke
 # All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,4 +24,4 @@ DIR_THIS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export TARGET_REPO_PATH=$(pwd)
 export TARGET_REPO_NAME=${PWD##*/}
 
-bash $DIR_THIS/industrial_ci/src/ci_main.sh
+env "$@" bash $DIR_THIS/industrial_ci/src/ci_main.sh