Merge pull request #12 from nsarlin-zama/rebase_version_on_main

final one ?
nsarlin-zama · Oct 8, 2024 · 7020718 · 7020718
2 parents d92173c + b243f59
commit 7020718
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.github/workflows/on_merge.yml b/.github/workflows/on_merge.yml
@@ -17,16 +17,14 @@ jobs:
       - name: Get branch for the latest version
         run: |
           echo hello
-          git fetch --all
-          echo $(git for-each-ref --format='%(refname:short)' refs/remotes/origin)
-          echo $(git for-each-ref --format='%(refname:short)' refs/remotes/origin | grep -Po '(?<=origin/)v\d.\d(.\d)?$')
-          echo "DATA_LATEST_VERSION=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin \
+          echo "DATA_LATEST_VERSION=\
+          $(git for-each-ref --format='%(refname:short)' refs/remotes/origin \
           | grep -Po '(?<=origin/)v\d.\d(.\d)?$' \
           | sort -V | tail -n 1\
           )" >> $GITHUB_ENV
 
       - name: Rebase and push
         run: |
           git switch $DATA_LATEST_VERSION
-          git rebase master
+          git rebase main
           git push --force-with-lease