From 1df35e59e61a2a2d14980def9cbbfb3750ac8b68 Mon Sep 17 00:00:00 2001 From: Roshin Rajan Panackal Date: Tue, 9 Jun 2026 17:17:54 +0200 Subject: [PATCH] For orchestration, compare against orchestration-staging as api truth --- .github/workflows/spec-update.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/spec-update.yaml b/.github/workflows/spec-update.yaml index b75a50f61..2f395b3d9 100644 --- a/.github/workflows/spec-update.yaml +++ b/.github/workflows/spec-update.yaml @@ -233,15 +233,16 @@ jobs: if: steps.spec_diff.outputs.spec_diff == 'true' env: MODULE_PATH: ${{ steps.download.outputs.module_path }} + BASE: ${{ steps.pr_base.outputs.BASE }} run: | - # Extract main branch source into a temporary directory - git fetch --no-tags --depth=1 origin main - mkdir -p /tmp/main-baseline - git archive origin/main | tar -x -C /tmp/main-baseline + # Extract $BASE branch source into a temporary directory + git fetch --no-tags --depth=1 origin "$BASE" + mkdir -p /tmp/api-baseline + git archive "origin/$BASE" | tar -x -C /tmp/api-baseline # Build inside a subshell to avoid polluting the working directory ( - cd /tmp/main-baseline + cd /tmp/api-baseline mvn package -DskipTests -pl "$MODULE_PATH" -am ${{ env.MVN_MULTI_THREADED_ARGS }} FINAL_NAME=$(mvn -q -pl "$MODULE_PATH" help:evaluate -Dexpression=project.build.finalName -DforceStdout) cp "$MODULE_PATH/target/${FINAL_NAME}.jar" /tmp/baseline.jar @@ -270,9 +271,9 @@ jobs: FINAL_NAME=$(mvn -q -pl "$MODULE_PATH" help:evaluate -Dexpression=project.build.finalName -DforceStdout) CURRENT_JAR="$MODULE_PATH/target/${FINAL_NAME}.jar" - # Run japicmp: compare baseline (main) JAR vs newly generated JAR + # Run japicmp: compare baseline ($BASE) JAR vs newly generated JAR if mvn com.github.siom79.japicmp:japicmp-maven-plugin:cmp@api-compatibility \ - -pl "$MODULE_PATH" \ + -pl "$MODULE_PATH" \ -Djapicmp.oldVersion.file=/tmp/baseline.jar \ -Djapicmp.newVersion.file="$CURRENT_JAR" \ ${{ env.MVN_MULTI_THREADED_ARGS }} ; then