diff options
| author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2023-12-31 18:58:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 18:58:50 +0100 |
| commit | a1502e9ad3ed44b2a0a8ab5f17d4d2bf5238d9cf (patch) | |
| tree | 0f171ab768fa6f8dd8d68fc4f0675baffbfd5e5d /.github/workflows | |
| parent | ad70253601a77844347d8aa1989ae5ab4fb4217c (diff) | |
| parent | 00a4bb6fb5e107788ea77cad51c8c8004a9537f1 (diff) | |
| download | NorthstarMods-a1502e9ad3ed44b2a0a8ab5f17d4d2bf5238d9cf.tar.gz NorthstarMods-a1502e9ad3ed44b2a0a8ab5f17d4d2bf5238d9cf.zip | |
Merge pull request #777 from R2Northstar/main
Update FD branch
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/add-to-project.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/merge-conflict-auto-label.yml | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 3a1d1c9a..773a52b8 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -4,7 +4,7 @@ on: issues: types: - opened - pull_request: + pull_request_target: types: - opened diff --git a/.github/workflows/merge-conflict-auto-label.yml b/.github/workflows/merge-conflict-auto-label.yml new file mode 100644 index 00000000..e237726a --- /dev/null +++ b/.github/workflows/merge-conflict-auto-label.yml @@ -0,0 +1,16 @@ +name: Merge Conflict Auto Label +on: + push: + branches: + - main + +jobs: + triage: + runs-on: ubuntu-latest + steps: + - uses: mschilde/auto-label-merge-conflicts@master + with: + CONFLICT_LABEL_NAME: "merge conflicts" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MAX_RETRIES: 5 + WAIT_MS: 5000 |