Merge pull request #7 from SmartCityFlensburg/release/v0.0.1

New Release v0.0.1
green-ecolution · May 26, 2024 · f29bb16 · f29bb16
2 parents 577e5bf + 3d697ac
commit f29bb16
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-and-push-production.yml b/.github/workflows/build-and-push-production.yml
@@ -45,17 +45,17 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Merge main into dev branch
+      - name: Merge main into develop branch
         uses: thomaseizinger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           head: main
-          base: dev
-          title: Merge main into dev branch
+          base: develop
+          title: Merge main into develop branch
           body: |
-            This PR merges the main branch back into dev.
-            This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the dev branch.
+            This PR merges the main branch back into develop.
+            This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the develop branch.
 
       - name: Checkout code
         uses: actions/checkout@v4