Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge master into issue-templates to sync with master #91

Merged
merged 7 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
configuration:
any:
- any:
- .devcontainer/*
- .editorconfig
- .gitattributes
Expand All @@ -9,7 +9,7 @@ configuration:
- .vscode/*
- DogApparel/.trunk/trunk.yaml
documentation:
any:
- any:
- CHANGELOG.TXT
- CHANGELOG.md
- CODE_OF_CONDUCT.md
Expand All @@ -19,30 +19,30 @@ documentation:
- SUPPORT.md
- Wiki.md
github:
any:
- any:
- .github/*
- .github/workflows/*
github_actions:
any:
- any:
- .github/workflows/*.yaml
- .github/workflows/*.yml
images:
any:
- any:
- 'public/**/*.{ico,svg,jpg,jpeg,png,gif}'
- 'Textures/DogApparel/Things/Pawn/Animal/Body/*png'
- 'Textures/DogApparel/Things/Pawn/Animal/Head/*png'
- 'Textures/DogApparel/Things/Pawn/Humanlike/Body/*png'
- 'Textures/DogApparel/Things/Pawn/Humanlike/Head/*png'
policy:
any:
- any:
- .github/ISSUE_TEMPLATE/*
- .github/PULL_TEMPLATE/*
source:
any:
- any:
- src/DogApparel
- src/docs/DogApparel
XML:
any:
- any:
- DogApparel/1.4/Defs/*.xml
- DogApparel/About/About.xml
- DogApparel/LoadFolders.xml
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/trunk-check.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Pull Request
on: [pull_request]
on:
workflow_dispatch:
pull_request:
branches: [master]
concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true
Expand All @@ -16,9 +19,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v3.6.0

- name: Trunk Check
uses: trunk-io/[email protected]
uses: trunk-io/[email protected]

with:
check-mode: all
cache: true
arguments: --github-annotate-new-only=false
7 changes: 7 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pull_request_rules:
- name: Automatic merge on approval
conditions:
- "#approved-reviews-by>=1"
actions:
merge:
method: merge
Loading