Updating workflow, removing branch creation

This commit is contained in:
Robbie Davis 2021-08-02 08:55:26 -04:00
parent 84c88fdf3d
commit 74dc6fd5dc

View File

@ -152,19 +152,6 @@ jobs:
ref: version-bump-${{steps.get-version.outputs.assembly-version}} ref: version-bump-${{steps.get-version.outputs.assembly-version}}
fetch-depth: 0 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 - name: Setup .NET Core
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
@ -182,14 +169,6 @@ jobs:
version_files: Kavita.Common/Kavita.Common.csproj version_files: Kavita.Common/Kavita.Common.csproj
github_token: ${{ secrets.GITHUB_TOKEN }} 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 - name: Trigger Docker Nightly
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }} if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
uses: benc-uk/workflow-dispatch@v1 uses: benc-uk/workflow-dispatch@v1