diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6947e297e..21d70664a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,7 @@ on: pull_request: branches: - develop + - v5-develop paths-ignore: - "src/NzbDrone.Core/Localization/Core/**" - "src/Sonarr.Api.*/openapi.json" diff --git a/.github/workflows/conflict_labeler.yml b/.github/workflows/conflict_labeler.yml index e9afb71a3..52ff28337 100644 --- a/.github/workflows/conflict_labeler.yml +++ b/.github/workflows/conflict_labeler.yml @@ -7,6 +7,7 @@ on: pull_request_target: branches: - develop + - v5-develop types: [synchronize] jobs: @@ -21,6 +22,5 @@ jobs: - name: Apply label uses: eps1lon/actions-label-merge-conflict@v3 with: - dirtyLabel: 'merge-conflict' - repoToken: '${{ secrets.GITHUB_TOKEN }}' - \ No newline at end of file + dirtyLabel: "merge-conflict" + repoToken: "${{ secrets.GITHUB_TOKEN }}"