ci,build: let OS_VERSION propagate as env-var

At the moment it's passed as both env-var and argument to some scripts. This makes things a bit harder to integrate. Sometimes OS_VERSION is empty, because it is read from a shell arg. So, just let it propagate as an env-var. Signed-off-by: Alexandru Ardelean <[email protected]>
analogdevicesinc · Apr 6, 2020 · 1b5bae4 · 1b5bae4
1 parent 9ba5de1
commit 1b5bae4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -97,7 +97,7 @@ addons:
 before_install:
   - if [[ "$ARCH" == "arm" ]] ; then ./CI/travis/setup_qemu_for_arm.sh ${OS_VERSION} ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./CI/travis/before_install_darwin ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./CI/travis/before_install_linux "$OS_TYPE" "$OS_VERSION" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./CI/travis/before_install_linux "$OS_TYPE" ; fi
   - if [[ -n "$COVERITY_SCAN_PROJECT_NAME" ]] ; then echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- ; fi
   - if [ -n "$COVERITY_SCAN_PROJECT_NAME" -a "$TRAVIS_EVENT_TYPE" == "cron" ] ; then curl -s 'https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh' | bash || true ; fi
 
@@ -106,7 +106,7 @@ before_install:
 
 script:
   - if [[ "$ARCH" == "arm" && "$TRAVIS_OS_NAME" == "linux" ]]; then ${TRAVIS_BUILD_DIR}/CI/travis/make_linux_qemu ; fi
-  - if [[ -z "$ARCH" && "$TRAVIS_OS_NAME" == "linux" ]]; then ${TRAVIS_BUILD_DIR}/CI/travis/make_linux libiio "$OS_TYPE" "$OS_VERSION" ; fi
+  - if [[ -z "$ARCH" && "$TRAVIS_OS_NAME" == "linux" ]]; then ${TRAVIS_BUILD_DIR}/CI/travis/make_linux libiio "$OS_TYPE" ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ${TRAVIS_BUILD_DIR}/CI/travis/make_darwin; fi
   - if [[ "$TRIGGER_NEXT_BUILD" == "true" ]]; then ${TRAVIS_BUILD_DIR}/CI/travis/after_deploy; fi
 

diff --git a/CI/travis/before_install_linux b/CI/travis/before_install_linux
@@ -33,6 +33,5 @@ handle_default() {
 }
 
 OS_TYPE=${1:-default}
-OS_VERSION=${2}
 
 handle_${OS_TYPE}
diff --git a/CI/travis/lib.sh b/CI/travis/lib.sh
@@ -19,7 +19,7 @@ export HOMEBREW_NO_INSTALL_CLEANUP
 #
 # If these nothing should be passed, then clear or
 #'unset INSIDE_DOCKER_TRAVIS_CI_ENV' after this script is included
-INSIDE_DOCKER_TRAVIS_CI_ENV="TRAVIS TRAVIS_COMMIT TRAVIS_PULL_REQUEST"
+INSIDE_DOCKER_TRAVIS_CI_ENV="TRAVIS TRAVIS_COMMIT TRAVIS_PULL_REQUEST OS_VERSION"
 
 COMMON_SCRIPTS="inside_docker.sh"
 

diff --git a/CI/travis/make_linux b/CI/travis/make_linux
@@ -73,7 +73,6 @@ handle_ubuntu_docker() {
 
 LIBNAME="$1"
 OS_TYPE=${2:-default}
-OS_VERSION="$3"
 
 handle_${OS_TYPE}