diff options
| author | Olly Betts <olly@survex.com> | 2023-04-19 11:46:42 +1200 |
|---|---|---|
| committer | Olly Betts <olly@survex.com> | 2023-04-19 11:46:42 +1200 |
| commit | 1ec05d04f700683e69862bf1c0a27f0802ee4f64 (patch) | |
| tree | 19322fbc28d038d96c6714191c0525b6ab954d6d | |
| parent | e1d59d0016f65cc4b15f0f1840b3beef5555267a (diff) | |
| download | swig-1ec05d04f700683e69862bf1c0a27f0802ee4f64.tar.gz | |
[ci] Resurrect Ruby 2.0-2.3 jobs and add 3.2 job
| -rw-r--r-- | .github/workflows/ci.yml | 24 | ||||
| -rw-r--r-- | Tools/CI-linux-environment.sh | 6 | ||||
| -rw-r--r-- | Tools/CI-linux-install.sh | 45 |
3 files changed, 41 insertions, 34 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc1227481..f7f059d25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,21 +146,18 @@ jobs: - SWIGLANG: python SWIG_FEATURES: -builtin -O - SWIGLANG: r + # rvm fails to install Ruby 1.9 on ubuntu-20.04 #- SWIGLANG: ruby # VER: '1.9' # os: ubuntu-18.04 - #- SWIGLANG: ruby - # VER: '2.0' - # os: ubuntu-18.04 - #- SWIGLANG: ruby - # VER: '2.1' - # os: ubuntu-18.04 - #- SWIGLANG: ruby - # VER: '2.2' - # os: ubuntu-18.04 - #- SWIGLANG: ruby - # VER: '2.3' - # os: ubuntu-18.04 + - SWIGLANG: ruby + VER: '2.0' + - SWIGLANG: ruby + VER: '2.1' + - SWIGLANG: ruby + VER: '2.2' + - SWIGLANG: ruby + VER: '2.3' - SWIGLANG: ruby VER: '2.4' - SWIGLANG: ruby @@ -175,6 +172,9 @@ jobs: - SWIGLANG: ruby VER: '3.1' CPPSTD: c++11 + - SWIGLANG: ruby + CPPSTD: c++11 + VER: '3.2' - SWIGLANG: scilab VER: '5.5.2' - SWIGLANG: scilab diff --git a/Tools/CI-linux-environment.sh b/Tools/CI-linux-environment.sh index e854c5b0e..3655108be 100644 --- a/Tools/CI-linux-environment.sh +++ b/Tools/CI-linux-environment.sh @@ -25,7 +25,11 @@ case "$SWIGLANG" in "ruby") if ! command -v rvm; then set +x - source $HOME/.rvm/scripts/rvm + if [ -f /etc/profile.d/rvm.sh ] ; then + source /etc/profile.d/rvm.sh + elif [ -f $HOME/.rvm/scripts/rvm ] ; then + source $HOME/.rvm/scripts/rvm + fi set -x fi ;; diff --git a/Tools/CI-linux-install.sh b/Tools/CI-linux-install.sh index 456f5bc42..93bb46412 100644 --- a/Tools/CI-linux-install.sh +++ b/Tools/CI-linux-install.sh @@ -117,32 +117,35 @@ case "$SWIGLANG" in $RETRY sudo apt-get -qq install r-base ;; "ruby") - if ! command -v rvm; then + if [[ "$VER" ]]; then case "$VER" in - 1.9 | 2.0 | 2.1 | 2.2 | 2.3 ) - $RETRY sudo apt-get -qq install libgdbm-dev libncurses5-dev libyaml-dev libssl1.0-dev + 3.1 | 3.2 ) + # Ruby 3.1+ support is currently only rvm master (2023-04-19) + # YOLO + curl -sSL https://rvm.io/mpapis.asc | gpg --import - + curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - + curl -sSL https://get.rvm.io | bash -s stable + set +x + source $HOME/.rvm/scripts/rvm + $RETRY rvm get master + rvm reload + rvm list known + set -x + ;; + * ) + # Install from PPA as that also contains packages needed for the build. + sudo apt-add-repository -y ppa:rael-gc/rvm + sudo apt-get update + sudo apt-get install rvm + sudo usermod -a -G rvm $USER + set +x + source /etc/profile.d/rvm.sh + set -x ;; esac - # YOLO - curl -sSL https://rvm.io/mpapis.asc | gpg --import - - curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - - curl -sSL https://get.rvm.io | bash -s stable set +x - source $HOME/.rvm/scripts/rvm - set -x - fi - case "$VER" in - 2.7 | 3.0 | 3.1 ) - # Ruby 2.7+ support is currently only rvm master (30 Dec 2019) - set +x - $RETRY rvm get master - rvm reload - rvm list known - set -x - ;; - esac - if [[ "$VER" ]]; then $RETRY rvm install $VER + set -x fi ;; "scilab") |