ci: re-sync develop with main

cdrani · Aug 13, 2023 · 391ca73 · 391ca73
1 parent b25aca7
commit 391ca73
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,6 +38,16 @@ jobs:
           branch: ${{ github.ref }}
           tags: true
 
+      - name: Nightly Merge
+        uses: robotology/[email protected]
+        with:
+          allow_ff: true
+          ff_only: true
+          stable_branch: 'main'
+          development_branch: 'develop'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Archive Extension Files
         if: steps.semver.outputs.version != ''
         run: zip -r Chorus.zip . -x "*.git*" "*.*rc" "*.md"