Skip to content

Commit 357f444

Browse files
committed
RCBC-538: Remove Ruby 3.1 GHA jobs
1 parent cf43bda commit 357f444

7 files changed

Lines changed: 9 additions & 38 deletions

File tree

.github/workflows/tests.yml

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
name: scripts-${{ needs.source.outputs.gem_version }}
125125
- name: Install build environment
126126
env:
127-
SUPPORTED_RUBY_VERSIONS: "3.1 3.2 3.3 3.4 4.0"
127+
SUPPORTED_RUBY_VERSIONS: "3.2 3.3 3.4 4.0"
128128
run: |
129129
bash bin/jenkins/install-rubies.sh
130130
- uses: actions/download-artifact@v4
@@ -133,7 +133,7 @@ jobs:
133133
name: couchbase-${{ needs.source.outputs.gem_version }}
134134
- name: Build gem
135135
env:
136-
SUPPORTED_RUBY_VERSIONS: "3.1 3.2 3.3 3.4 4.0"
136+
SUPPORTED_RUBY_VERSIONS: "3.2 3.3 3.4 4.0"
137137
BUNDLE_ALLOW_ROOT: true
138138
run: |
139139
bash bin/jenkins/build-gem.sh
@@ -150,7 +150,6 @@ jobs:
150150
fail-fast: false
151151
matrix:
152152
ruby:
153-
- '3.1'
154153
- '3.2'
155154
- '3.3'
156155
- '3.4'
@@ -190,10 +189,6 @@ jobs:
190189
- uses: actions/download-artifact@v4
191190
with:
192191
name: scripts-${{ needs.source.outputs.gem_version }}
193-
- uses: actions/download-artifact@v4
194-
with:
195-
path: pkg/binary/3.1
196-
name: couchbase-${{ needs.source.outputs.gem_version }}-x86_64-linux-3.1
197192
- uses: actions/download-artifact@v4
198193
with:
199194
path: pkg/binary/3.2
@@ -229,7 +224,6 @@ jobs:
229224
fail-fast: false
230225
matrix:
231226
ruby:
232-
- '3.1'
233227
- '3.2'
234228
- '3.3'
235229
- '3.4'
@@ -269,10 +263,6 @@ jobs:
269263
- uses: actions/download-artifact@v4
270264
with:
271265
name: scripts-${{ needs.source.outputs.gem_version }}
272-
- uses: actions/download-artifact@v4
273-
with:
274-
path: pkg/binary/3.1
275-
name: couchbase-${{ needs.source.outputs.gem_version }}-aarch64-linux-3.1
276266
- uses: actions/download-artifact@v4
277267
with:
278268
path: pkg/binary/3.2
@@ -308,7 +298,6 @@ jobs:
308298
fail-fast: false
309299
matrix:
310300
ruby:
311-
- '3.1'
312301
- '3.2'
313302
- '3.3'
314303
- '3.4'
@@ -348,10 +337,6 @@ jobs:
348337
- uses: actions/download-artifact@v4
349338
with:
350339
name: scripts-${{ needs.source.outputs.gem_version }}
351-
- uses: actions/download-artifact@v4
352-
with:
353-
path: pkg/binary/3.1
354-
name: couchbase-${{ needs.source.outputs.gem_version }}-arm64-darwin-3.1
355340
- uses: actions/download-artifact@v4
356341
with:
357342
path: pkg/binary/3.2
@@ -387,7 +372,6 @@ jobs:
387372
fail-fast: false
388373
matrix:
389374
ruby:
390-
- '3.1'
391375
- '3.2'
392376
- '3.3'
393377
- '3.4'
@@ -427,10 +411,6 @@ jobs:
427411
- uses: actions/download-artifact@v4
428412
with:
429413
name: scripts-${{ needs.source.outputs.gem_version }}
430-
- uses: actions/download-artifact@v4
431-
with:
432-
path: pkg/binary/3.1
433-
name: couchbase-${{ needs.source.outputs.gem_version }}-x86_64-darwin-3.1
434414
- uses: actions/download-artifact@v4
435415
with:
436416
path: pkg/binary/3.2
@@ -469,7 +449,6 @@ jobs:
469449
fail-fast: false
470450
matrix:
471451
ruby:
472-
- '3.1'
473452
- '3.2'
474453
- '3.3'
475454
- '3.4'
@@ -531,7 +510,6 @@ jobs:
531510
fail-fast: false
532511
matrix:
533512
ruby:
534-
- '3.1'
535513
- '3.2'
536514
- '3.3'
537515
- '3.4'
@@ -596,7 +574,6 @@ jobs:
596574
fail-fast: false
597575
matrix:
598576
ruby:
599-
- '3.1'
600577
- '3.2'
601578
- '3.3'
602579
- '3.4'
@@ -755,7 +732,6 @@ jobs:
755732
fail-fast: false
756733
matrix:
757734
ruby:
758-
- '3.1'
759735
- '3.2'
760736
- '3.3'
761737
- '3.4'
@@ -794,10 +770,6 @@ jobs:
794770
- uses: actions/download-artifact@v4
795771
with:
796772
name: scripts-${{ needs.source.outputs.gem_version }}
797-
- uses: actions/download-artifact@v4
798-
with:
799-
path: pkg/binary/3.1
800-
name: couchbase-${{ needs.source.outputs.gem_version }}-x64-mingw-3.1
801773
- uses: actions/download-artifact@v4
802774
with:
803775
path: pkg/binary/3.2
@@ -845,7 +817,6 @@ jobs:
845817
# fail-fast: false
846818
# matrix:
847819
# ruby:
848-
# - '3.1'
849820
# - '3.2'
850821
# - '3.3'
851822
# - '3.4'

bin/jenkins/build-gem.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ echo "CONTAINER_TAG=${CONTAINER_TAG}"
2222
echo "JENKINS_SLAVE_LABELS=${JENKINS_SLAVE_LABELS}"
2323
echo "NODE_LABELS=${NODE_LABELS}"
2424

25-
SUPPORTED_RUBY_VERSIONS="3.3 3.2 3.1"
25+
SUPPORTED_RUBY_VERSIONS="3.2 3.3 3.4 4.0"
2626
CMAKE_VERSION=3.28.1
2727
if [ -d "${HOME}/.cmake-${CMAKE_VERSION}/bin" ]
2828
then

bin/jenkins/install-dependencies-for-alpine.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ ${SUDO} /sbin/apk add \
4545

4646
# NOTE: we don't want to build 3.0 on Alpine, as it will require
4747
# switching OpenSSL to 1.1
48-
export SUPPORTED_RUBY_VERSIONS="3.1 3.2 3.3"
48+
export SUPPORTED_RUBY_VERSIONS="3.2 3.3 3.4 4.0"
4949

5050
exec bash ${PROJECT_ROOT}/bin/jenkins/install-rubies.sh

bin/jenkins/install-dependencies-for-macos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ then
5454
rm -rf ${HOME}/.gem/ruby
5555
fi
5656
# NOTE: Exclude Ruby 3.0 to avoid openssl@1.1
57-
export SUPPORTED_RUBY_VERSIONS="3.1 3.2 3.3"
57+
export SUPPORTED_RUBY_VERSIONS="3.2 3.3 3.4 4.0"
5858
exec ${PROJECT_ROOT}/bin/jenkins/install-rubies.sh

bin/jenkins/install-dependencies-for-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ${SUDO} apt-get install -y \
4747

4848
# NOTE: Ubuntu 22+ removed OpenSSL 1.1 compatibility,
4949
# so Ruby 3.0.x will not work without extra patches
50-
export SUPPORTED_RUBY_VERSIONS="3.1 3.2 3.3"
50+
export SUPPORTED_RUBY_VERSIONS="3.2 3.3 3.4 4.0"
5151

5252
rm -rf ${HOME}/.rubies
5353
exec ${PROJECT_ROOT}/bin/jenkins/install-rubies.sh

bin/jenkins/install-rubies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ set -e
2020

2121
[ "$(id -u)" -ne 0 ] && SUDO="sudo " || SUDO=""
2222

23-
SUPPORTED_RUBY_VERSIONS=${SUPPORTED_RUBY_VERSIONS:-"3.1 3.2 3.3"}
23+
SUPPORTED_RUBY_VERSIONS=${SUPPORTED_RUBY_VERSIONS:-"3.2 3.3 3.4 4.0"}
2424
RUBY_CONFIGURE_FLAGS=${RUBY_CONFIGURE_FLAGS:-}
2525

26-
RUBY_INSTALL_VERSION=0.9.3
26+
RUBY_INSTALL_VERSION=0.10.1
2727
CHRUBY_VERSION=0.3.9
2828

2929

test/mock_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
class Caves
2525
attr_accessor :verbose
2626

27-
VERSION = "v0.0.1-78"
27+
VERSION = "v0.0.1-79"
2828
FORK = "couchbaselabs"
2929

3030
def download_mock(url = caves_url)

0 commit comments

Comments
 (0)