Merge pull request #93 from ConductionNL/hotfix/updated-release-workflow

Update release-workflow.yaml
ConductionNL · Dec 16, 2024 · 0cdf000 · 0cdf000
2 parents 8893f2a + 5dd41c1
commit 0cdf000
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/pull-request-from-branch-check.yaml b/.github/workflows/pull-request-from-branch-check.yaml
@@ -3,7 +3,7 @@ name: Main Branch Protection
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   check-branch:

diff --git a/.github/workflows/release-workflow(nightly).yaml b/.github/workflows/release-workflow(nightly).yaml
@@ -3,7 +3,7 @@ name: Release Workflow(nightly)
 on:
   push:
     branches:
-      - development
+      - never
   workflow_dispatch:
     inputs:
       version:

diff --git a/.github/workflows/release-workflow.yaml b/.github/workflows/release-workflow.yaml
@@ -21,6 +21,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
 
       - name: Set app env
         run: |
@@ -44,7 +45,7 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "GitHub Action"
-          git commit -am "Bump version to ${{ env.NEW_VERSION }}"
+          git commit -am "Bump version to ${{ env.NEW_VERSION }}" -m "[skip ci]"
           git push
 
       # Step 1: Prepare the signing certificate and key
@@ -193,4 +194,4 @@ jobs:
           echo "Tarball contents:"
           tar -tvf nextcloud-release.tar.gz
           echo "info.xml contents:"
-          tar -xOf nextcloud-release.tar.gz ${{ env.APP_NAME }}/appinfo/info.xml
+          tar -xOf nextcloud-release.tar.gz ${{ env.APP_NAME }}/appinfo/info.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Main Branch Protection @@
     on:
       pull_request:
         branches:
-          - master
+          - main
     jobs:
       check-branch:
@@ Expand Down @@