(amoro) branch master updated: [AMORO-3875][FOLLOWUP] Fix optimizer-spark docker image build due to artifactId change (#3912)

[jinsongzhou]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new 12e7946d6 [AMORO-3875][FOLLOWUP] Fix optimizer-spark docker image 
build due to artifactId change (#3912)
12e7946d6 is described below

commit 12e7946d6aed7d5df7619e09b48ea5cd475743d5
Author: Fei Wang <fwan...@ebay.com>
AuthorDate: Sun Nov 9 20:35:56 2025 -0800

    [AMORO-3875][FOLLOWUP] Fix optimizer-spark docker image build due to 
artifactId change (#3912)
    
    * fix
    
    save
    
    * test
    
    * Revert "test"
    
    This reverts commit 6c38dbd2b465803ba84621a83e0c382d9c4bccc8.
---
 .github/workflows/docker-images.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-images.yml 
b/.github/workflows/docker-images.yml
index c2e811d13..5b75fec68 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -187,6 +187,7 @@ jobs:
     strategy:
       matrix:
         spark: [ "3.3.3" ]
+        scala: [ "2.12.15" ]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 11
@@ -226,10 +227,14 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Set optimizer spark version
+      - name: Set optimizer spark version and extract versions
+        id: versions
         run: |
-          OPTIMIZER_SPARK=${{ matrix.spark }} && \
-          echo 
"OPTIMIZER_SPARK=-Dspark-optimizer.spark-version${OPTIMIZER_SPARK}" >> 
$GITHUB_ENV
+          echo "SPARK_VERSION=-Dspark.version=${{ matrix.spark }}" >> 
$GITHUB_ENV && \
+          SPARK_MAJOR_VERSION=$(echo "${{ matrix.spark }}" | cut -d. -f1-2) && 
\
+          echo "SPARK_MAJOR_VERSION=${SPARK_MAJOR_VERSION}" >> $GITHUB_OUTPUT 
&& \
+          SCALA_BINARY_VERSION=$(echo "${{ matrix.scala }}" | cut -d. -f1-2) 
&& \
+          echo "SCALA_BINARY_VERSION=${SCALA_BINARY_VERSION}" >> $GITHUB_OUTPUT
 
       - name: Set ENV Amoro version
         id: version
@@ -240,12 +245,14 @@ jobs:
           && echo "AMORO_VERSION=${AMORO_VERSION}" >> $GITHUB_OUTPUT
 
       - name: Build optimizer module with Maven
-        run: ./mvnw clean package -pl 'amoro-optimizer/amoro-optimizer-spark' 
-am -e ${OPTIMIZER_SPARK} -DskipTests -B -ntp
+        run: ./mvnw clean package -pl 'amoro-optimizer/amoro-optimizer-spark' 
-am -e ${SPARK_VERSION} -DskipTests -B -ntp
 
       - name: Build and Push Spark Optimizer Docker Image
         uses: docker/build-push-action@v4
         env:
           AMORO_VERSION: ${{ steps.version.outputs.AMORO_VERSION }}
+          SPARK_MAJOR_VERSION: ${{ steps.versions.outputs.SPARK_MAJOR_VERSION 
}}
+          SCALA_BINARY_VERSION: ${{ 
steps.versions.outputs.SCALA_BINARY_VERSION }}
         with:
           context: .
           push: true
@@ -254,6 +261,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           build-args: |
             SPARK_VERSION=${{ matrix.spark }}
-            
OPTIMIZER_JOB=amoro-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${{
 env.AMORO_VERSION }}-jar-with-dependencies.jar
+            
OPTIMIZER_JOB=amoro-optimizer/amoro-optimizer-spark/target/amoro-optimizer-spark-${{
 env.SPARK_MAJOR_VERSION}}_${{ env.SCALA_BINARY_VERSION}}-${{ env.AMORO_VERSION 
}}-jar-with-dependencies.jar