ruby-changes:67022
From: Hiroshi <ko1@a...>
Date: Mon, 2 Aug 2021 12:40:13 +0900 (JST)
Subject: [ruby-changes:67022] 8b466ea5fc (master): Use `${{}}` for if statement
https://git.ruby-lang.org/ruby.git/commit/?id=8b466ea5fc From 8b466ea5fc00dcd400a57cc03db4537f0cb8fc81 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Mon, 2 Aug 2021 11:39:38 +0900 Subject: Use `${{}}` for if statement --- .github/workflows/baseruby.yml | 2 +- .github/workflows/check_dependencies.yml | 6 +++--- .github/workflows/compilers.yml | 12 ++++++------ .github/workflows/macos.yml | 6 +++--- .github/workflows/mingw.yml | 2 +- .github/workflows/mjit.yml | 2 +- .github/workflows/spec_guards.yml | 2 +- .github/workflows/ubuntu.yml | 8 ++++---- .github/workflows/windows.yml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/baseruby.yml b/.github/workflows/baseruby.yml index 11f71e0..532d4a9 100644 --- a/.github/workflows/baseruby.yml +++ b/.github/workflows/baseruby.yml @@ -42,4 +42,4 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/baseruby.yml#L42 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml index 77227bb..645da40 100644 --- a/.github/workflows/check_dependencies.yml +++ b/.github/workflows/check_dependencies.yml @@ -13,12 +13,12 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/check_dependencies.yml#L13 set -x sudo apt-get update -q || : sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby - if: "contains(matrix.os, 'ubuntu')" + if: ${{ contains(matrix.os, 'ubuntu') }} - name: Install libraries run: | brew upgrade brew install gmp libffi openssl@1... zlib autoconf automake libtool readline - if: "contains(matrix.os, 'macos')" + if: ${{ contains(matrix.os, 'macos') }} - name: git config run: | git config --global advice.detachedHead 0 @@ -42,4 +42,4 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/check_dependencies.yml#L42 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml index ea19c01..f267ee2 100644 --- a/.github/workflows/compilers.yml +++ b/.github/workflows/compilers.yml @@ -189,15 +189,15 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L189 - run: $make leaked-globals - run: $make test - run: $make install - if: "matrix.entry.name == '-O3'" + if: ${{ matrix.entry.name == '-O3' }} - run: /usr/local/bin/gem install --no-doc timezone tzinfo - if: "matrix.entry.name == '-O3'" + if: ${{ matrix.entry.name == '-O3' }} - run: $make test-tool - if: "matrix.entry.name == '-O3'" + if: ${{ matrix.entry.name == '-O3' }} - run: $make test-all TESTS='-- ruby -ext-' - if: "matrix.entry.name == '-O3'" + if: ${{ matrix.entry.name == '-O3' }} - run: $make test-spec - if: "matrix.entry.name == '-O3'" + if: ${{ matrix.entry.name == '-O3' }} - uses: k0kubun/action-slack@v... with: @@ -211,7 +211,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L211 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b69b0fb..0a2d7ea 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -34,9 +34,9 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/macos.yml#L34 - run: make $JOBS incs - run: make $JOBS - run: make leaked-globals - if: matrix.test_task == 'check' + if: ${{ matrix.test_task == 'check' }} - run: make prepare-gems - if: matrix.test_task == 'check' + if: ${{ matrix.test_task == 'check' }} - run: make $JOBS -s ${{ matrix.test_task }} timeout-minutes: 60 env: @@ -54,7 +54,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/macos.yml#L54 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 6787f96..8f5a8e6 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -136,7 +136,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L136 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml index 99282cf..63011e7 100644 --- a/.github/workflows/mjit.yml +++ b/.github/workflows/mjit.yml @@ -70,7 +70,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mjit.yml#L70 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/spec_guards.yml b/.github/workflows/spec_guards.yml index f921d66..61ebeb3 100644 --- a/.github/workflows/spec_guards.yml +++ b/.github/workflows/spec_guards.yml @@ -35,4 +35,4 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/spec_guards.yml#L35 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f7b07ca..e148b76 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -48,13 +48,13 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/ubuntu.yml#L48 - run: make $JOBS incs - run: make $JOBS - run: make leaked-globals - if: matrix.test_task == 'check' + if: ${{ matrix.test_task == 'check' }} - run: make prepare-gems - if: matrix.test_task == 'check' + if: ${{ matrix.test_task == 'check' }} - name: Create dummy files in build dir run: | ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}' - if: matrix.test_task == 'check' + if: ${{ matrix.test_task == 'check' }} - run: make $JOBS -s ${{ matrix.test_task }} timeout-minutes: 30 env: @@ -72,7 +72,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/ubuntu.yml#L72 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} defaults: run: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fdcccff..6adc4fc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -92,7 +92,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L92 } env: SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot - if: failure() && github.event_name == 'push' + if: ${{ failure() && github.event_name == 'push' }} defaults: run: -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/