Merge branch 'master' into dev

.github/workflows/update-dev.yml

@@ -27,12 +27,28 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.NIGHTLY_TOKEN }}
 
       - name: Nightly Merge
-        uses: robotology/[email protected]
-        with:
-          stable_branch: 'master'
-          development_branch: 'dev'
-          allow_ff: false
         env:
-          GITHUB_TOKEN: ${{ secrets.NIGHTLY_TOKEN }}
+          CONFIG_USERNAME: GitHub Nightly Merge Action
+          CONFIG_EMAIL: [email protected]
+          MERGE_HEAD: master
+          MERGE_BASE: dev
+          MERGE_ARGS: --no-ff --allow-unrelated-histories --no-edit
+        run: |
+          # This script is adapted from the robotology/[email protected] GitHub action:
+          # https://github.com/robotology/gh-action-nightly-merge/blob/master/entrypoint.sh
+
+          git config --global user.name "$CONFIG_USERNAME"
+          git config --global user.email "$CONFIG_EMAIL"
+
+          git fetch origin $MERGE_HEAD
+          (git checkout $MERGE_HEAD && git pull)
+
+          git fetch origin $MERGE_BASE
+          (git checkout $MERGE_BASE && git pull)
+
+          git merge $MERGE_ARGS $MERGE_HEAD
+          git push origin $MERGE_BASE