Merge branch 'branch-24.12' into regexp-line-terminator-optimization

Author: SurajAralihalli

.github/workflows/auto-merge.yml

@@ -18,24 +18,16 @@ name: auto-merge HEAD to BASE
 on:
   pull_request_target:
     branches:
-    - branch-24.08
+      - branch-*
     types: [closed]
 
 jobs:
   auto-merge:
     if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: branch-24.08 # force to fetch from latest upstream instead of PR ref
-
-      - name: auto-merge job
-        uses: ./.github/workflows/auto-merge
-        env:
-          OWNER: NVIDIA
-          REPO_NAME: spark-rapids
-          HEAD: branch-24.08
-          BASE: branch-24.10
-          AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR
+    uses: NVIDIA/spark-rapids-common/.github/workflows/auto-merge.yml@main
+    with:
+      owner: ${{ github.repository_owner }}
+      repo: spark-rapids
+      branch: ${{ github.event.pull_request.base.ref }}
+    secrets:
+      token: ${{ secrets.AUTOMERGE_TOKEN }}

.github/workflows/auto-merge/Dockerfile

@@ -246,12 +246,10 @@ jobs:
               echo "Generated Scala 2.13 build files don't match what's in repository"
               exit 1
           fi
-          # change to Scala 2.13 Directory
-          cd scala2.13
           # test command, will retry for 3 times if failed.
           max_retry=3; delay=30; i=1
           while true; do
-            mvn package \
+            mvn package -f scala2.13/ \
               -pl integration_tests,tests,tools -am -P 'individual,pre-merge' \
               -Dbuildver=${{ matrix.spark-version }} -Dmaven.scalastyle.skip=true \
               -Drat.skip=true ${{ env.COMMON_MVN_FLAGS }} && break || {
@@ -303,12 +301,10 @@ jobs:
               echo "Generated Scala 2.13 build files don't match what's in repository"
               exit 1
           fi
-          # change to Scala 2.13 Directory
-          cd scala2.13
           # test command, will retry for 3 times if failed.
           max_retry=3; delay=30; i=1
           while true; do
-            mvn verify \
+            mvn verify -f scala2.13/ \
               -P "individual,pre-merge,source-javadoc" -Dbuildver=${{ matrix.spark-version }} \
               ${{ env.COMMON_MVN_FLAGS }} && break || {
             if [[ $i -le $max_retry ]]; then