Skip to content

Commit 913e26c

Browse files
committed
update ruby so we no longer use EOL ruby for anything
1 parent 223b83a commit 913e26c

File tree

3 files changed

+40
-40
lines changed

3 files changed

+40
-40
lines changed

.github/workflows/build.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,36 @@ jobs:
77
rubocop:
88
name: Lint (Rubocop)
99
runs-on: ubuntu-24.04
10-
container: ruby:3.3-trixie
10+
container: ruby:3.4-trixie
1111
steps:
12-
- name: Checkout
13-
uses: actions/checkout@v2
14-
- name: Bundle
15-
run: bundle install
16-
- name: Rubocop
17-
run: bundle exec rubocop -f simple
12+
- name: Checkout
13+
uses: actions/checkout@v2
14+
- name: Bundle
15+
run: bundle install
16+
- name: Rubocop
17+
run: bundle exec rubocop -f simple
1818
shellcheck:
1919
name: Lint (Shellcheck)
2020
runs-on: ubuntu-24.04
2121
container: debian:trixie
2222
steps:
23-
- name: Checkout
24-
uses: actions/checkout@v2
25-
- name: Install shellcheck
26-
run: apt-get update && apt-get install -y shellcheck
27-
- name: Shellcheck
28-
run: shellcheck libexec/*
23+
- name: Checkout
24+
uses: actions/checkout@v2
25+
- name: Install shellcheck
26+
run: apt-get update && apt-get install -y shellcheck
27+
- name: Shellcheck
28+
run: shellcheck libexec/*
2929
build-ruby:
3030
name: Build (ruby)
3131
outputs:
3232
GEM_VERSION: ${{ steps.set-metadata.outputs.GEM_VERSION }}
3333
runs-on: ubuntu-24.04
34-
container: ruby:3.3-trixie
34+
container: ruby:3.4-trixie
3535
steps:
3636
- name: Update Rubygems and Bundler
3737
run: |
38-
gem update --system 3.3.26
39-
gem install bundler -v '~> 2.3.26'
38+
gem update --system
39+
gem install bundler
4040
- name: Checkout
4141
uses: actions/checkout@v2
4242
- name: Bundle
@@ -203,10 +203,10 @@ jobs:
203203
run: |
204204
case ${{ matrix.libc }} in
205205
gnu)
206-
echo 'ruby:3.3-trixie'
206+
echo 'ruby:3.4-trixie'
207207
;;
208208
musl)
209-
echo 'ruby:3.1-alpine'
209+
echo 'ruby:3.4-alpine'
210210
;;
211211
esac | tee container_image
212212
echo "::set-output name=image::$(cat container_image)"
@@ -227,8 +227,8 @@ jobs:
227227
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apt-get install -y binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
228228
- name: Update Rubygems and Bundler
229229
run: |
230-
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem update --system 3.3.26
231-
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem install bundler -v '~> 2.3.26'
230+
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem update --system
231+
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem install bundler
232232
- name: Checkout
233233
uses: actions/checkout@v2
234234
- name: Bundle
@@ -290,12 +290,6 @@ jobs:
290290
- amd64
291291
# other platforms would need emulation, which is way too slow
292292
container:
293-
- image: ruby:3.1
294-
version: '3.1'
295-
libc: gnu
296-
- image: ruby:3.1-alpine
297-
version: '3.1'
298-
libc: musl
299293
- image: ruby:3.2
300294
version: '3.2'
301295
libc: gnu
@@ -311,6 +305,12 @@ jobs:
311305
- image: ruby:3.3-trixie
312306
version: '3.3'
313307
libc: gnu
308+
- image: ruby:3.4
309+
version: '3.4'
310+
libc: gnu
311+
- image: ruby:3.4-alpine
312+
version: '3.4'
313+
libc: musl
314314
name: Test (ruby) (${{ matrix.container.version }}, ${{ matrix.platform }}, ${{ matrix.container.libc }})
315315
needs: build-ruby
316316
runs-on: ubuntu-24.04
@@ -321,8 +321,8 @@ jobs:
321321
run: apk add --no-cache build-base linux-headers bash python3 git curl tar
322322
- name: Update Rubygems and Bundler
323323
run: |
324-
gem update --system 3.3.26
325-
gem install bundler -v '~> 2.3.26'
324+
gem update --system
325+
gem install bundler
326326
- name: Set metadata
327327
id: set-metadata
328328
run: |
@@ -382,9 +382,9 @@ jobs:
382382
fail-fast: false
383383
matrix:
384384
version:
385-
- '3.1'
386385
- '3.2'
387386
- '3.3'
387+
- '3.4'
388388
platform:
389389
- amd64
390390
# arm64
@@ -395,15 +395,15 @@ jobs:
395395
- gnu
396396
- musl
397397
include:
398-
- version: '3.1'
399-
platform: 'arm64'
400-
libc: 'gnu'
401398
- version: '3.2'
402399
platform: 'arm64'
403400
libc: 'gnu'
404401
- version: '3.3'
405402
platform: 'arm64'
406403
libc: 'gnu'
404+
- version: '3.4'
405+
platform: 'arm64'
406+
libc: 'gnu'
407407
name: Test (linux)
408408
needs: build-linux
409409
runs-on: ubuntu-24.04
@@ -434,8 +434,8 @@ jobs:
434434
run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apk add --no-cache build-base git libstdc++
435435
- name: Update Rubygems and Bundler
436436
run: |
437-
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem update --system 3.3.26
438-
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem install bundler -v '~> 2.3.26'
437+
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem update --system
438+
docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem install bundler
439439
- name: Set metadata
440440
id: set-metadata
441441
run: |

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ARG RUBY_VERSION=3.3
1+
ARG RUBY_VERSION=3.4
22
FROM ruby:${RUBY_VERSION}
33

44
RUN test ! -f /etc/alpine-release || apk add --no-cache build-base bash python3 git curl tar ccache clang
55
RUN test -f /etc/alpine-release || (apt-get update && apt-get install -y ccache clang)
66
ENV CCACHE_DIR=/ccache
77

8-
RUN gem update --system 3.3.26 && gem install bundler -v '~> 2.3.26'
8+
RUN gem update --system && gem install bundler
99

1010
RUN mkdir -p /code
1111
WORKDIR /code

Makefile.docker

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ test/linux: test/$(subst arm64,aarch64,$(CPU))-linux
2121
test/linux-musl: test/$(subst arm64,aarch64,$(CPU))-linux-musl
2222

2323
pkg/libv8-node-$(VERSION)-x86_64-linux.gem:
24-
docker buildx build --platform linux/amd64 --build-arg RUBY_VERSION=3.1 --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-gnu .
24+
docker buildx build --platform linux/amd64 --build-arg RUBY_VERSION=3.4 --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-gnu .
2525
docker run --platform linux/amd64 --rm -it -v "$(PWD)/pkg":/pkg libv8-node:$(VERSION)-gnu cp $@ /pkg/
2626

2727
pkg/libv8-node-$(VERSION)-x86_64-linux-musl.gem:
28-
docker buildx build --platform linux/amd64 --build-arg RUBY_VERSION=3.1-alpine --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-musl .
28+
docker buildx build --platform linux/amd64 --build-arg RUBY_VERSION=3.4-alpine --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-musl .
2929
docker run --platform linux/amd64 --rm -it -v "$(PWD)/pkg":/pkg libv8-node:$(VERSION)-musl cp $@ /pkg/
3030

3131
pkg/libv8-node-$(VERSION)-aarch64-linux.gem:
32-
docker buildx build --platform linux/arm64 --build-arg RUBY_VERSION=3.1 --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-gnu .
32+
docker buildx build --platform linux/arm64 --build-arg RUBY_VERSION=3.4 --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-gnu .
3333
docker run --platform linux/arm64 --rm -it -v "$(PWD)/pkg":/pkg libv8-node:$(VERSION)-gnu cp $@ /pkg/
3434

3535
pkg/libv8-node-$(VERSION)-aarch64-linux-musl.gem:
36-
docker buildx build --platform linux/arm64 --build-arg RUBY_VERSION=3.1-alpine --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-musl .
36+
docker buildx build --platform linux/arm64 --build-arg RUBY_VERSION=3.4-alpine --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-musl .
3737
docker run --platform linux/arm64 --rm -it -v "$(PWD)/pkg":/pkg libv8-node:$(VERSION)-musl cp $@ /pkg/
3838

3939
test/x86_64-linux: pkg/libv8-node-$(VERSION)-x86_64-linux.gem

0 commit comments

Comments
 (0)