Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ jobs:
# declare rubygems for each ruby version
- { ruby: "3.0", rubygems: "3.5.23" }
# declare docker image for each platform
- { platform: aarch64-linux-musl, runon: "ubuntu-24.04-arm", docker_tag: "-alpine" }
- { platform: arm-linux-musl, runon: "ubuntu-24.04-arm", docker_tag: "-alpine" }
- { platform: x86-linux-musl, runon: "ubuntu-latest", docker_tag: "-alpine" }
- { platform: x86_64-linux-musl, runon: "ubuntu-latest", docker_tag: "-alpine" }
- { platform: aarch64-linux-musl, runon: "ubuntu-24.04-arm", docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
- { platform: arm-linux-musl, runon: "ubuntu-24.04-arm", docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
- { platform: x86-linux-musl, runon: "ubuntu-latest", docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
- { platform: x86_64-linux-musl, runon: "ubuntu-latest", docker_tag: "-alpine", bootstrap: "apk add build-base &&" }
- { platform: x86_64-linux, runon: "ubuntu-latest" }
- { platform: x86_64-linux-gnu, runon: "ubuntu-latest" }
# declare docker platform for each platform
Expand All @@ -267,6 +267,7 @@ jobs:
docker run --rm -v $PWD:/work -w /work \
${{ matrix.docker_platform}} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \
sh -c "
${{ matrix.bootstrap }}
if test -n '${{ matrix.rubygems }}' ; then gem update --system ${{ matrix.rubygems }} ; fi &&
gem install --local *.gem --verbose &&
cd test/rcd_test/ &&
Expand Down
2 changes: 1 addition & 1 deletion rake-compiler-dock.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Use rake-compiler-dock to enter an interactive shell session or add a task to yo
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_development_dependency "bundler", ">= 1.7", "< 3.0"
spec.add_development_dependency "bundler"
spec.add_development_dependency "rake", ">= 12"
spec.add_development_dependency "test-unit", "~> 3.0"
end
2 changes: 1 addition & 1 deletion test/env/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG from_image
FROM ${from_image}

RUN uname -a
RUN apk add ruby ruby-rake git
RUN apk add ruby ruby-dev ruby-rake git build-base

RUN ruby --version
RUN gem env
Expand Down
2 changes: 1 addition & 1 deletion test/env/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN uname -a
RUN apt-get update -qq && \
apt-get install -yq \
-o Dpkg::Options::='--force-confnew' \
ruby \
ruby ruby-dev build-essential \
git

RUN ruby --version
Expand Down
4 changes: 2 additions & 2 deletions test/rcd_test/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "https://rubygems.org"
# No rcd_test gem, since "bundle package" fails on bundler-2.7+, if the extension isn't built
# gemspec

gem "rake", "~> 13.0"
gem "rake"
gem "rake-compiler"
gem "rake-compiler-dock", path: "../.."
gem "minitest", "~> 5.0"
gem "minitest"
Loading