diff --git a/.github/workflows/pull-request-from-branch-check.yaml b/.github/workflows/pull-request-from-branch-check.yaml index a40f09f..77d1970 100644 --- 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 index 6e21603..9175139 100644 --- 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 index abc4f59..08379ca 100644 --- 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 "action@github.com" 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 \ No newline at end of file + tar -xOf nextcloud-release.tar.gz ${{ env.APP_NAME }}/appinfo/info.xml