ruby-changes:53838
From: shyouhei <ko1@a...>
Date: Wed, 28 Nov 2018 09:49:28 +0900 (JST)
Subject: [ruby-changes:53838] shyouhei:r66056 (trunk): .travis.yaml: unquote
shyouhei 2018-11-28 09:49:24 +0900 (Wed, 28 Nov 2018) New Revision: 66056 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66056 Log: .travis.yaml: unquote It was probably me, 7 years ago, in r33844, who started overly quoting YAML strings. But now, this file grown up 50+ times from 6 lines to more than 300. It is more annoying than convenient to quote everything to add backslashes here and there. Just use quotes only when necessary. Modified files: trunk/.travis.yml Index: .travis.yml =================================================================== --- .travis.yml (revision 66055) +++ .travis.yml (revision 66056) @@ -60,22 +60,22 @@ addons: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L60 cache: ccache: true directories: - - "$HOME/config_2nd" + - $HOME/config_2nd env: global: - - "CONFIGURE_TTY=no" - - "CCACHE_COMPILERCHECK=none" - - "CCACHE_NOCOMPRESS=1" - - "CCACHE_MAXSIZE=512Mi" + - CONFIGURE_TTY=no + - CCACHE_COMPILERCHECK=none + - CCACHE_NOCOMPRESS=1 + - CCACHE_MAXSIZE=512Mi - >- NPROC="`case ${TRAVIS_OS_NAME} in osx) sysctl -n hw.activecpu ;; linux) nproc ;; esac`" # JOBS and SETARCH are overridden when necessary; see below. - - "JOBS=-j$((1+${NPROC}))" - - "SETARCH=" + - JOBS=-j$((1+${NPROC})) + - SETARCH= .org.ruby-lang.ci.matrix-definitions: @@ -84,7 +84,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L84 - &make-test-only script: - - "$SETARCH make -s test TESTOPTS=\"${TESTOPTS=$JOBS -q --tty=no}\"" + - $SETARCH make -s test TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}" - &linux os: linux @@ -107,7 +107,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L107 <<: *linux <<: *cron-only env: - - "CONFIG_FLAG='--with-gmp --with-jemalloc --with-valgrind'" + - CONFIG_FLAG='--with-gmp --with-jemalloc --with-valgrind' - &VM_CHECK_MODE name: VM_CHECK_MODE=3 @@ -115,14 +115,14 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L115 <<: *cron-only <<: *make-test-only env: - - "cppflags=-DVM_CHECK_MODE=0x0003" + - cppflags=-DVM_CHECK_MODE=0x0003 - &FIBER_USE_sjlj name: FIBER_USE_NATIVE=0 <<: *linux <<: *cron-only env: - - "cppflags=-DFIBER_USE_NATIVE=0" + - cppflags=-DFIBER_USE_NATIVE=0 - &TOKEN_THREADED_CODE name: TOKEN_THREADED_CODE @@ -130,7 +130,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L130 <<: *cron-only <<: *make-test-only env: - - "cppflags=-DOPT_THREADED_CODE=1" + - cppflags=-DOPT_THREADED_CODE=1 - &CALL_THREADED_CODE name: CALL_THREADED_CODE @@ -138,7 +138,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L138 <<: *cron-only <<: *make-test-only env: - - "cppflags=-DOPT_THREADED_CODE=2" + - cppflags=-DOPT_THREADED_CODE=2 - &NO_THREADED_CODE name: NO_THREADED_CODE @@ -146,7 +146,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L146 <<: *cron-only <<: *make-test-only env: - - "cppflags=-DOPT_THREADED_CODE=3" + - cppflags=-DOPT_THREADED_CODE=3 - &ASAN name: -fsanitize=address @@ -155,12 +155,12 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L155 <<: *make-test-only compiler: clang env: - - "ASAN_OPTIONS=detect_leaks=0" - - "cflags='-march=native -fsanitize=address -fno-omit-frame-pointer'" - - "debugflags=-ggdb3" - - "optflags='-O1'" - - "LD=clang" - - "LDFLAGS=-fsanitize=address" + - ASAN_OPTIONS=detect_leaks=0 + - cflags='-march=native -fsanitize=address -fno-omit-frame-pointer' + - debugflags=-ggdb3 + - optflags=-O1 + - LD=clang + - LDFLAGS=-fsanitize=address - &MSAN name: -fsanitize=memory @@ -169,11 +169,11 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L169 <<: *make-test-only compiler: clang env: - - "cflags='-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer'" - - "optflags='-O1'" - - "LD=clang" - - "LDFLAGS=-fsanitize=memory" - - "CONFIG_FLAG=--with-out-ext=openssl" + - cflags='-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer' + - optflags=-O1 + - LD=clang + - LDFLAGS=-fsanitize=memory + - CONFIG_FLAG=--with-out-ext=openssl - &UBSAN name: -fsanitize=undefined @@ -182,21 +182,21 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L182 <<: *make-test-only compiler: clang env: - - "cflags='-fsanitize=undefined,integer,nullability -fno-omit-frame-pointer'" - - "cppflags='-DUNALIGNED_WORD_ACCESS=0'" - - "debugflags='-ggdb3'" - - "optflags='-O1 -march=native'" - - "LD=clang" - - "LDFLAGS=-fsanitize=undefined,integer,nullability" + - cflags='-fsanitize=undefined,integer,nullability -fno-omit-frame-pointer' + - cppflags=-DUNALIGNED_WORD_ACCESS=0 + - debugflags=-ggdb3 + - optflags='-O1 -march=native' + - LD=clang + - LDFLAGS=-fsanitize=undefined,integer,nullability - &i686-linux name: i686-linux <<: *linux sudo: required env: - - "GCC_FLAGS=-m32" - - "debugflags='-g0'" - - "SETARCH='setarch i686 --verbose --3gb'" + - GCC_FLAGS=-m32 + - debugflags=-g0 + - SETARCH='setarch i686 --verbose --3gb' addons: apt: config: @@ -222,14 +222,14 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L222 - zlib1g:i386 - &pedanticism - name: "-ansi -pedantic" + name: -ansi -pedantic <<: *linux <<: *make-test-only compiler: clang env: - - "GCC_FLAGS='-ansi -Werror=pedantic -pedantic-errors -std=iso9899:1990'" - - "CONFIG_FLAG=" - - "JOBS=" + - GCC_FLAGS='-ansi -Werror=pedantic -pedantic-errors -std=iso9899:1990' + - CONFIG_FLAG= + - JOBS= - >- warnflags=' -Wall @@ -255,7 +255,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L255 -Wno-unused-parameter -Wunused-variable ' - - "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 @@ -275,8 +275,8 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L275 name: x86_64-darwin17 <<: *osx env: - - "CONFIG_FLAG='--with-opt-dir=/usr/local/opt/openssl@1...:/usr/local/opt/zlib'" - - "TEST_ALL_OPTS=\"$JOBS -q --tty=no --excludes=\\$(TESTSDIR)/excludes/_travis/osx\"" + - CONFIG_FLAG=--with-opt-dir=/usr/local/opt/openssl@1...:/usr/local/opt/zlib + - TEST_ALL_OPTS="$JOBS -q --tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx" - &universal-darwin17 name: uinversal.x86_64h-darwin17 @@ -284,8 +284,8 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L284 <<: *cron-only <<: *make-test-only env: - - "CONFIG_FLAG='--with-arch=x86_64h,x86_64,i386'" - - "TEST_ALL_OPTS=\"$JOBS -q --tty=no --excludes=\\$(TESTSDIR)/excludes/_travis/osx\"" + - CONFIG_FLAG=--with-arch=x86_64h,x86_64,i386 + - TEST_ALL_OPTS="$JOBS -q --tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx" matrix: include: @@ -312,50 +312,53 @@ matrix: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L312 fast_finish: true before_script: - - "echo JOBS=${JOBS} SETARCH=${SETARCH}" - - "$SETARCH uname -a" - - "$SETARCH uname -r" - - "rm -fr .ext autom4te.cache" - - "echo $TERM" + - echo JOBS=${JOBS} SETARCH=${SETARCH} + - $SETARCH uname -a + - $SETARCH uname -r + - rm -fr .ext autom4te.cache + - echo $TERM - "> config.status" - - "sed -f tool/prereq.status Makefile.in common.mk > Makefile" - - "make update-config_files" - - "make touch-unicode-files" - - "make -s $JOBS srcs UNICODE_FILES=." - - "rm config.status Makefile rbconfig.rb .rbconfig.time" + - sed -f tool/prereq.status Makefile.in common.mk > Makefile + - make update-config_files + - make touch-unicode-files + - make -s $JOBS srcs UNICODE_FILES=. + - rm config.status Makefile rbconfig.rb .rbconfig.time - |- if [ -d ~/config_2nd ]; then cp -pr ~/config_2nd build else mkdir build fi - - "mkdir config_1st config_2nd" - - "chmod -R a-w ." - - "chmod -R u+w build config_1st config_2nd" - - "cd build" - - "ccache --show-stats" + - mkdir config_1st config_2nd + - chmod -R a-w . + - chmod -R u+w build config_1st config_2nd + - cd build + - ccache --show-stats - |- case "$CC" in gcc*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";; clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";; esac - - "[ ! -f config.cache ] || [ \"$CC\" = \"`sed -n s/^ac_cv_prog_CC=//p config.cache`\" ] || (set -x; exec rm config.cache)" - - "$SETARCH ../configure -C --disable-install-doc --prefix=/tmp/ruby-prefix $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" - - "(cd .. && exec diff -ru config_1st config_2nd)" - - "chmod u+w .." - - "rm -r ~/config_2nd" - - "mv ../config_2nd ~" - - "chmod u-w .." - - "$SETARCH make -s $JOBS && make install" - - "ccache --show-stats" + - |- + [ ! -f config.cache ] || + [ "$CC" = "`sed -n s/^ac_cv_prog_CC=//p config.cache`" ] || + (set -x; exec rm config.cache) + - $SETARCH ../configure -C --disable-install-doc --prefix=/tmp/ruby-prefix $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 + - (cd .. && exec diff -ru config_1st config_2nd) + - chmod u+w .. + - rm -r ~/config_2nd + - mv ../config_2nd ~ + - chmod u-w .. + - $SETARCH make -s $JOBS && make install + - ccache --show-stats script: - - "$SETARCH make -s test TESTOPTS=\"${TESTOPTS=$JOBS -q --tty=no}\"" - - "$SETARCH make -s test-all -o exts TESTOPTS=\"${TEST_ALL_OPTS=$TESTOPTS}\"" - - "$SETARCH make -s test-spec MSPECOPT=-ff" # not using `-j` because sometimes `mspec -j` silently dies + - $SETARCH make -s test TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}" + - $SETARCH make -s test-all -o exts TESTOPTS="${TEST_ALL_OPTS=$TESTOPTS}" + - $SETARCH make -s test-spec MSPECOPT=-ff # not using `-j` because sometimes `mspec -j` silently dies # Branch matrix. Not all branches are Travis-ready so we limit branches here. branches: -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/