From 318f84cc969b11fc12338bb393b8e23e6c6ac52c Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Tue, 21 May 2024 11:21:51 +0200 Subject: [PATCH 1/3] build jruby-9.4 image with 9.4.7.0 version --- ...jruby-9.4.0.0 => Dockerfile-jruby-9.4.7.0} | 19 ++++--------------- docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) rename .circleci/images/primary/{Dockerfile-jruby-9.4.0.0 => Dockerfile-jruby-9.4.7.0} (84%) diff --git a/.circleci/images/primary/Dockerfile-jruby-9.4.0.0 b/.circleci/images/primary/Dockerfile-jruby-9.4.7.0 similarity index 84% rename from .circleci/images/primary/Dockerfile-jruby-9.4.0.0 rename to .circleci/images/primary/Dockerfile-jruby-9.4.7.0 index 2f5db4a4dab..93de2ef93dc 100644 --- a/.circleci/images/primary/Dockerfile-jruby-9.4.0.0 +++ b/.circleci/images/primary/Dockerfile-jruby-9.4.7.0 @@ -1,22 +1,11 @@ -# Note: -# -# There is an incompatibility between ethon and httprb on debian 11 bullseye. -# This is why this image is based on debian 10 buster. -# -# See: -# - https://github.com/jruby/jruby/issues/7033 -# - https://github.com/DataDog/dd-trace-rb/pull/2380#issuecomment-1320994823 - # Note: See the "Publishing updates to images" note in ./README.md for how to publish new builds of this container image -# openjdk:11-jre image is from https://github.com/docker-library/openjdk/blob/8dfb0c5645098b8c330c4811c8228cae52f18388/11/jre/buster/Dockerfile -# note: docker-library/openjdk is deprecated, there is a later move to https://hub.docker.com/_/eclipse-temurin -FROM openjdk:11-jre-buster AS jruby-9.4.0.0-jre11 +FROM eclipse-temurin:11-jammy AS jruby-9.4.7.0-jre11 RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV JRUBY_VERSION 9.4.0.0 -ENV JRUBY_SHA256 897bb8a98ad43adcbf5fd3aa75ec85b3312838c949592ca3f623dc1f569d2870 +ENV JRUBY_VERSION 9.4.7.0 +ENV JRUBY_SHA256 f1c39f8257505300a528ff83fe4721fbe61a855abb25e3d27d52d43ac97a4d80 RUN mkdir /opt/jruby \ && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \ && echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \ @@ -46,7 +35,7 @@ RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ CMD [ "irb" ] -FROM jruby-9.4.0.0-jre11 +FROM jruby-9.4.7.0-jre11 # Make apt non-interactive RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \ diff --git a/docker-compose.yml b/docker-compose.yml index 6b55c053c61..aad1a38ca5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -248,7 +248,7 @@ services: - bundle-jruby-9.3:/usr/local/bundle - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}" tracer-jruby-9.4: - image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.0.0-dd + image: ghcr.io/datadog/dd-trace-rb/jruby:9.4.7.0-dd command: /bin/bash depends_on: - ddagent From 6a41fa7d53632ba12c05fcba23bdad4d622ecc4d Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Tue, 21 May 2024 11:56:27 +0200 Subject: [PATCH 2/3] use correct jruby version in build-ruby GHA workflow --- .github/workflows/build-ruby.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ruby.yml b/.github/workflows/build-ruby.yml index ab2af6a59af..e87e1b13136 100644 --- a/.github/workflows/build-ruby.yml +++ b/.github/workflows/build-ruby.yml @@ -50,8 +50,8 @@ jobs: version: 9.3.9.0 dockerfile: Dockerfile-jruby-9.3.9.0 - engine: jruby - version: 9.4.0.0 - dockerfile: Dockerfile-jruby-9.4.0.0 + version: 9.4.7.0 + dockerfile: Dockerfile-jruby-9.4.7.0 runs-on: ubuntu-latest name: Build (${{ matrix.engine }} ${{ matrix.version }}) steps: From 8646536520c8c1fda511a7a7470d215b7b73d00e Mon Sep 17 00:00:00 2001 From: Tony Hsu Date: Tue, 21 May 2024 11:45:37 +0200 Subject: [PATCH 3/3] Remove bundler cache in for `setup-ruby` step and pin bundler and rubygem version --- .github/workflows/test-macos.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-macos.yaml b/.github/workflows/test-macos.yaml index 5023b54b9bc..ac43afc1075 100644 --- a/.github/workflows/test-macos.yaml +++ b/.github/workflows/test-macos.yaml @@ -38,7 +38,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - bundler-cache: true # runs 'bundle install' and caches installed gems automatically - bundler: latest # needed to fix issue with steep on Ruby 3.0/3.1 - cache-version: v2 # bump this to invalidate cache + rubygems: 3.3.26 + bundler: 2.3.26 # needed to fix issue with steep on Ruby 3.0/3.1 + - run: bundle install - run: bundle exec rake spec:main