Merge pull request #22 from MonsieurBon/build-improvement

Merge master back into develop after publishing a new release
swisspost · Aug 18, 2023 · dabdd27 · dabdd27
2 parents 878dba4 + 8bfe11d
commit dabdd27
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -39,3 +39,11 @@ jobs:
         CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
         CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
         CI_GPG_PASSPHRASE: ${{ secrets.CI_GPG_PASSPHRASE }}
+
+    - name: Merge back to develop
+      run: |
+        git fetch --depth 1 origin develop
+        git checkout develop
+        git fetch --shallow-since="$(git show -s --format=%ci develop)" origin master develop
+        git merge master --no-edit
+        git push origin develop