Skip to content

Commit 1fe07f9

Browse files
Adam Cozzettehaberman
andauthored
Cherry-pick fix from #9311 into 3.18.x (#9320)
* Dropped Ruby 2.4 support for CI and releases. * Removed Kokoro configs for old Ruby versions. * Update Dockerfile to allow it to be rebuilt Co-authored-by: Joshua Haberman <[email protected]>
1 parent 8a0aa4b commit 1fe07f9

File tree

16 files changed

+5
-133
lines changed

16 files changed

+5
-133
lines changed

kokoro/linux/dockerfile/test/ruby/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@ RUN apt-get update && apt-get install -y \
2323
&& apt-get clean
2424

2525
# Install rvm
26-
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys \
26+
RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys \
2727
409B6B1796C275462A1703113804BB82D39DC0E3 \
2828
7D2BAF1CF37B13E2069D6956105BD0E739499BDB
29-
RUN \curl -sSL https://get.rvm.io | bash -s master
29+
RUN \curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s master
3030

31-
RUN /bin/bash -l -c "rvm install 2.3.8"
32-
RUN /bin/bash -l -c "rvm install 2.4.5"
3331
RUN /bin/bash -l -c "rvm install 2.5.1"
3432
RUN /bin/bash -l -c "rvm install 2.6.0"
3533
RUN /bin/bash -l -c "rvm install 2.7.0"

kokoro/linux/ruby23/build.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

kokoro/linux/ruby23/continuous.cfg

Lines changed: 0 additions & 11 deletions
This file was deleted.

kokoro/linux/ruby23/presubmit.cfg

Lines changed: 0 additions & 11 deletions
This file was deleted.

kokoro/linux/ruby24/build.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

kokoro/linux/ruby24/continuous.cfg

Lines changed: 0 additions & 11 deletions
This file was deleted.

kokoro/linux/ruby24/presubmit.cfg

Lines changed: 0 additions & 11 deletions
This file was deleted.

kokoro/macos/ruby23/build.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

kokoro/macos/ruby23/continuous.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

kokoro/macos/ruby23/presubmit.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)