diff --git a/.ci/awesome_bot.sh b/.ci/awesome_bot.sh index 5604c8ff30..b142f420ac 100755 --- a/.ci/awesome_bot.sh +++ b/.ci/awesome_bot.sh @@ -1,9 +1,15 @@ #!/bin/bash +if type awesome_bot >/dev/null 2>&1; then + AWESOME_BOT_EXEC="awesome_bot" +else + AWESOME_BOT_EXEC="bundle exec awesome_bot" +fi + awesome_bot_with_retry() { local attempt_max=5 local -i attempt_num=1 - until awesome_bot "$@"; do + until ${AWESOME_BOT_EXEC} "$@"; do if ((attempt_num == attempt_max)); then exit 1 fi diff --git a/.github/workflows/awesome-bot.yml b/.github/workflows/awesome-bot.yml index bbf66a0dc3..6c7796098f 100644 --- a/.github/workflows/awesome-bot.yml +++ b/.github/workflows/awesome-bot.yml @@ -10,16 +10,23 @@ on: name: AsesomeBot jobs: check: - runs-on: ubuntu-latest + # act の場合 github.actor_id がないのでそれを利用 + # act の image に libssl1.1 が入ってないので 20.04 を使う + runs-on: ${{ (github.actor_id == null && 'ubuntu-20.04') || 'ubuntu-latest' }} env: ASESOME_BOT_OPTION: --allow-redirect --allow-ssl --allow-dupe -t 60 steps: - uses: actions/checkout@v3 + - name: Create Gemfile + run: | + { + echo 'source "http://rubygems.org"' + echo "gem 'awesome_bot'" + } > Gemfile - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 - - name: install - run: gem install awesome_bot + ruby-version: 3.1 + bundler-cache: true - name: check run: | # shellcheck disable=SC2086 diff --git a/.github/workflows/gtest-compat.yml b/.github/workflows/gtest-compat.yml index fc06ad6f4e..cae33fee56 100644 --- a/.github/workflows/gtest-compat.yml +++ b/.github/workflows/gtest-compat.yml @@ -16,6 +16,8 @@ on: - '*.yaml' - '.circleci/**' - '.semaphore/**' + - '.github/**' + - '!.github/workflows/gtest-compat.yml' push: branches: - master