From 74dc6fd5dc300317ae99318f80d7e8ffd18fce5f Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Mon, 2 Aug 2021 08:55:26 -0400 Subject: [PATCH] Updating workflow, removing branch creation --- .github/workflows/sonar-scan.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index c8b7f1edc..fddfa4cc5 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -152,19 +152,6 @@ jobs: ref: version-bump-${{steps.get-version.outputs.assembly-version}} fetch-depth: 0 - - name: Create local changes for reference - run: | - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --local user.name "github-actions[bot]" - git pull origin version-bump-${{steps.get-version.outputs.assembly-version}} - git commit --allow-empty -m "Trigger Build" - - - name: Push changes - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: version-bump-${{steps.get-version.outputs.assembly-version}} - - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: @@ -182,14 +169,6 @@ jobs: version_files: Kavita.Common/Kavita.Common.csproj github_token: ${{ secrets.GITHUB_TOKEN }} - - name: Merge bump branch -> pr branch - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: version-bump-${{ github.event.inputs.version }} - target_branch: develop - github_token: ${{ secrets.GITHUB_TOKEN }} - - name: Trigger Docker Nightly if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }} uses: benc-uk/workflow-dispatch@v1