From 67dac575fc9068a7712b9a178bc7a36a23a4f789 Mon Sep 17 00:00:00 2001 From: Hung Nguyen Date: Thu, 22 May 2025 17:13:55 +0700 Subject: [PATCH 1/2] GRIF-302: Update LCM bricks to run with latest JRuby9.4.12.1 version --- .github/workflows/build.yml | 4 ++-- .github/workflows/pre-merge.yml | 2 +- Dockerfile | 2 +- Dockerfile.jruby | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ea4256aa..b81466ff9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: jruby-9.4.1 + ruby-version: jruby-9.4.12.1 bundler-cache: true - uses: actions/setup-java@v4 with: @@ -41,7 +41,7 @@ jobs: needs: [jruby-gem-release, rubygems-release] strategy: matrix: - ruby-version: [3.2.1, jruby-9.4.1] + ruby-version: [3.2.1, jruby-9.4.12.1] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index c1127bc89..8f975f27f 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - ruby-version: [2.5, 2.6, 2.7.6, 3.2.1, jruby-9.2.21, jruby-9.3.14, jruby-9.4.1] + ruby-version: [2.5, 2.6, 2.7.6, 3.2.1, jruby-9.2.21, jruby-9.3.14, jruby-9.4.12.1] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 diff --git a/Dockerfile b/Dockerfile index 79ec013c8..476db9966 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202501070635.05b6a77 ARG RVM_VERSION=stable -ARG JRUBY_VERSION=9.4.1.0 +ARG JRUBY_VERSION=9.4.12.1 LABEL image_name="GDC LCM Bricks" LABEL maintainer="LCM " diff --git a/Dockerfile.jruby b/Dockerfile.jruby index e02d0818f..bc15ae718 100644 --- a/Dockerfile.jruby +++ b/Dockerfile.jruby @@ -1,4 +1,4 @@ -FROM jruby:9.4.1.0 +FROM jruby:9.4.12.1 MAINTAINER Tomas Korcak From 1a89989ccf3e70753b382f597daf48a7c4808460 Mon Sep 17 00:00:00 2001 From: Hung Nguyen Date: Mon, 26 May 2025 10:55:45 +0700 Subject: [PATCH 2/2] config(lcm): Remove no used image tag --- .gdc-ii-config.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gdc-ii-config.yaml b/.gdc-ii-config.yaml index 501c06355..e29cbd795 100644 --- a/.gdc-ii-config.yaml +++ b/.gdc-ii-config.yaml @@ -1,15 +1,15 @@ microservices: - lcm-bricks: - docker: - dockerfile: './Dockerfile' - # specifies whether promote image to M3 image tag when release LCM. Default always promote image. Don't remote - # image when promoteImage configure false - promoteImage: false - # specifies whether run register pipeline components for the image when promote image. Default always run register - # pipeline components. Don't run register when registerPipelineComponentsWhenPromote configure false - registerPipelineComponentsWhenPromote: false - argumentsFromFiles: - BRICKS_VERSION: 'VERSION' +# lcm-bricks: +# docker: +# dockerfile: './Dockerfile' +# # specifies whether promote image to M3 image tag when release LCM. Default always promote image. Don't remote +# # image when promoteImage configure false +# promoteImage: false +# # specifies whether run register pipeline components for the image when promote image. Default always run register +# # pipeline components. Don't run register when registerPipelineComponentsWhenPromote configure false +# registerPipelineComponentsWhenPromote: false +# argumentsFromFiles: +# BRICKS_VERSION: 'VERSION' lcm-bricks-nextversion: docker: dockerfile: './Dockerfile'