Testssssssssss

Author: compilin

.github/workflows/main.yml

@@ -75,6 +75,11 @@ jobs:
           elif ! [ -f "$RESULT" ]; then
             echo "::error::Couldn't find sdist file" && exit 1
           else
+            RESULT_R=${RESULT/.post/.r}
+            if [[ "$RESULT_R" != "$RESULT" ]]; then
+              mv -v "$RESULT" "$RESULT_R"
+              RESULT="$RESULT_R"
+            fi
             echo "::notice::Successfully generated sdist $RESULT"
           fi
           echo "sdist-file=$RESULT" >> $GITHUB_OUTPUT
@@ -169,7 +174,7 @@ jobs:
             echo "::error::Merge base $MERGE_BASE is not the second parent of main ref $MAIN_BRANCH ($MAIN_PARENT)"
             exit 1
           fi
-          git merge --no-ff -m "Merge version $GMICPY_VERSION into $MAIN_BRANCH"
+          git merge --no-ff -m "Merge version $GMICPY_VERSION into $MAIN_BRANCH" "$TARGET"
           TAGNAME="v$GMICPY_VERSION"
           MERGEHASH=$( git rev-parse HEAD )
           git tag "$TAGNAME" && echo "::notice::Tagged merge commit $MERGEHASH as $TAGNAME"