Skip to content

Commit

Permalink
build on Ruby 3.1 instead of Ruby instead of 2.7 which is EOL
Browse files Browse the repository at this point in the history
  • Loading branch information
SamSaffron committed Sep 13, 2024
1 parent 19d6513 commit 951f0ac
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,10 @@ jobs:
run: |
case ${{ matrix.libc }} in
gnu)
echo 'ruby:2.7'
echo 'ruby:3.1'
;;
musl)
echo 'ruby:2.7-alpine'
echo 'ruby:3.1-alpine'
;;
esac | tee container_image
echo "::set-output name=image::$(cat container_image)"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUBY_VERSION=2.7
ARG RUBY_VERSION=3.1
FROM ruby:${RUBY_VERSION}

RUN test ! -f /etc/alpine-release || apk add --no-cache build-base bash python3 git curl tar ccache clang
Expand Down
8 changes: 4 additions & 4 deletions Makefile.docker
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ test/linux: test/$(subst arm64,aarch64,$(CPU))-linux
test/linux-musl: test/$(subst arm64,aarch64,$(CPU))-linux-musl

pkg/libv8-node-$(VERSION)-x86_64-linux.gem:
docker buildx build --platform linux/amd64 --build-arg RUBY_VERSION=2.7 --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-gnu .
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 .
docker run --platform linux/amd64 --rm -it -v "$(PWD)/pkg":/pkg libv8-node:$(VERSION)-gnu cp $@ /pkg/

pkg/libv8-node-$(VERSION)-x86_64-linux-musl.gem:
docker buildx build --platform linux/amd64 --build-arg RUBY_VERSION=2.7-alpine --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-musl .
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 .
docker run --platform linux/amd64 --rm -it -v "$(PWD)/pkg":/pkg libv8-node:$(VERSION)-musl cp $@ /pkg/

pkg/libv8-node-$(VERSION)-aarch64-linux.gem:
docker buildx build --platform linux/arm64 --build-arg RUBY_VERSION=2.7 --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-gnu .
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 .
docker run --platform linux/arm64 --rm -it -v "$(PWD)/pkg":/pkg libv8-node:$(VERSION)-gnu cp $@ /pkg/

pkg/libv8-node-$(VERSION)-aarch64-linux-musl.gem:
docker buildx build --platform linux/arm64 --build-arg RUBY_VERSION=2.7-alpine --build-arg NODE_VERSION=$(NODE_VERSION) --progress plain -t libv8-node:$(VERSION)-musl .
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 .
docker run --platform linux/arm64 --rm -it -v "$(PWD)/pkg":/pkg libv8-node:$(VERSION)-musl cp $@ /pkg/

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

0 comments on commit 951f0ac

Please sign in to comment.