From bf5c84a41dde90497f3f382d6ee378bc978239a8 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 26 Nov 2018 02:46:50 +0000 Subject: [PATCH] .travis.yml: avoid bashism We can set environment variables to avoid before_script. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- .travis.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd06cf5aff..66bcfaacfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -230,9 +230,8 @@ env: - "GCC_FLAGS='-ansi -Werror=pedantic -pedantic-errors -std=iso9899:1990'" - "CONFIG_FLAG=" - "JOBS=" - # construct warnflags (using bashism...) - before_install: | - warnflags_array=( + - >- + warnflags=' -Wall -Wextra -Werror=declaration-after-statement @@ -255,10 +254,8 @@ env: -Wno-unused-local-typedef -Wno-unused-parameter -Wunused-variable - ) - CONFIG_FLAG_ARRAY=( - warnflags="${warnflags_array[*]}" - LDFLAGS=-Wno-unused-command-line-argument) + ' + - "LDFLAGS='-Wno-unused-command-line-argument'" - &rubyspec name: ruby/spec on Ruby 2.3 # to ensure version guards are correctly added @@ -342,8 +339,7 @@ before_script: gcc*) the_gcc=(ccache $CC ${GCC_FLAGS[@]} -fno-diagnostics-color) ;; clang*) the_gcc=(ccache $CC ${GCC_FLAGS[@]} -fno-color-diagnostics) ;; esac - - |- - $SETARCH ../configure -C --disable-install-doc --prefix=/tmp/ruby-prefix --with-gcc="${the_gcc[*]}" $CONFIG_FLAG "${CONFIG_FLAG_ARRAY[@]}" + - "$SETARCH ../configure -C --disable-install-doc --prefix=/tmp/ruby-prefix --with-gcc=\"${the_gcc[*]}\" $CONFIG_FLAG" - "cp -pr config.cache config.status .ext/include ../config_1st" - "$SETARCH make reconfig" - "cp -pr config.cache config.status .ext/include ../config_2nd"