We did not have tool/ before checkout
anyway we don't need authorization here. Also retry does not seem to work in the original version, so let's extend this with retries as a separate github action later.
This commit is contained in:
parent
4f10a61eaa
commit
b1ef14176b
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -22,7 +22,7 @@ jobs:
|
|||||||
brew update
|
brew update
|
||||||
brew install gdbm gmp libffi openssl zlib ccache autoconf automake libtool readline
|
brew install gdbm gmp libffi openssl zlib ccache autoconf automake libtool readline
|
||||||
- name: Checkout # not using actions/checkout because it's unstable.
|
- name: Checkout # not using actions/checkout because it's unstable.
|
||||||
run: tool/ci_retry.sh git clone --depth=50 https://github.com/ruby/ruby .
|
run: git clone --depth=50 https://github.com/ruby/ruby .
|
||||||
- name: Set ENV
|
- name: Set ENV
|
||||||
run: |
|
run: |
|
||||||
echo '##[set-env name=JOBS]'-j$((1 + $(sysctl -n hw.activecpu)))
|
echo '##[set-env name=JOBS]'-j$((1 + $(sysctl -n hw.activecpu)))
|
||||||
|
2
.github/workflows/ubuntu.yml
vendored
2
.github/workflows/ubuntu.yml
vendored
@ -21,7 +21,7 @@ jobs:
|
|||||||
sudo apt-get install ruby2.5
|
sudo apt-get install ruby2.5
|
||||||
sudo apt-get build-dep ruby2.5
|
sudo apt-get build-dep ruby2.5
|
||||||
- name: Checkout # not using actions/checkout because it's unstable.
|
- name: Checkout # not using actions/checkout because it's unstable.
|
||||||
run: tool/ci_retry.sh git clone --depth=50 https://github.com/ruby/ruby .
|
run: git clone --depth=50 https://github.com/ruby/ruby .
|
||||||
- name: Set ENV
|
- name: Set ENV
|
||||||
run: |
|
run: |
|
||||||
export JOBS=-j$((1 + $(nproc --all)))
|
export JOBS=-j$((1 + $(nproc --all)))
|
||||||
|
16
.travis.yml
16
.travis.yml
@ -91,10 +91,10 @@ env:
|
|||||||
# sources:
|
# sources:
|
||||||
# - ubuntu-toolchain-r-test
|
# - ubuntu-toolchain-r-test
|
||||||
before_install:
|
before_install:
|
||||||
- tool/ci_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
|
- tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
|
||||||
- tool/ci_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq"
|
- tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq"
|
||||||
- |-
|
- |-
|
||||||
tool/ci_retry.sh sudo -E apt-get $travis_apt_get_options install \
|
tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
|
||||||
gcc-8 \
|
gcc-8 \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
libgdbm-dev \
|
libgdbm-dev \
|
||||||
@ -119,9 +119,9 @@ env:
|
|||||||
config:
|
config:
|
||||||
retries: true
|
retries: true
|
||||||
before_install:
|
before_install:
|
||||||
- tool/ci_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq"
|
- tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq"
|
||||||
- |-
|
- |-
|
||||||
tool/ci_retry.sh sudo -E apt-get $travis_apt_get_options install \
|
tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
|
||||||
clang-8 \
|
clang-8 \
|
||||||
llvm-8-tools \
|
llvm-8-tools \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
@ -277,10 +277,10 @@ env:
|
|||||||
# sources:
|
# sources:
|
||||||
# - ubuntu-toolchain-r-test
|
# - ubuntu-toolchain-r-test
|
||||||
before_install:
|
before_install:
|
||||||
- tool/ci_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
|
- tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
|
||||||
- tool/ci_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq"
|
- tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq"
|
||||||
- |-
|
- |-
|
||||||
tool/ci_retry.sh sudo -E apt-get $travis_apt_get_options install \
|
tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
|
||||||
gcc-8-multilib \
|
gcc-8-multilib \
|
||||||
libffi-dev:i386 \
|
libffi-dev:i386 \
|
||||||
libffi6:i386 \
|
libffi6:i386 \
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#!/bin/sh -eu
|
#!/bin/sh -eu
|
||||||
# The modified version of `travis_retry` to support custom backoffs, which is used by .travis.yml.
|
# The modified version of `travis_retry` to support custom backoffs, which is used by .travis.yml.
|
||||||
# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/travis_retry.bash
|
# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/travis_retry.bash
|
||||||
#
|
|
||||||
# Now this is also used by .github/workflow/*.yml.
|
|
||||||
|
|
||||||
for sleep in 0 ${WAITS:- 1 25 100}; do
|
for sleep in 0 ${WAITS:- 1 25 100}; do
|
||||||
sleep "$sleep"
|
sleep "$sleep"
|
Loading…
x
Reference in New Issue
Block a user