Skip to content

Commit

Permalink
merge master into issue-template to be in sync (#84)
Browse files Browse the repository at this point in the history
merge master into issue-template to be in sync and after issue-template
is in sync I can than make issue templates which I can pull in to
origin/master
  • Loading branch information
Chunnyluny committed Sep 17, 2023
2 parents bd9969f + d04b822 commit e58c5e3
Show file tree
Hide file tree
Showing 7 changed files with 176 additions and 158 deletions.
72 changes: 48 additions & 24 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,57 @@
# Add 'source' label to any change to src files within the source dir EXCEPT for the docs sub-folder
source:
- any: [src/DogApparel, src/docs/DogApparel]

# Add 'documentation' label to any root file changes, README, CHANGELOG, etc
any:
- src/DogApparel
- src/docs/DogApparel
documentation:
- any: [README.md, CHANGELOG.md, LICENSE, Wiki.md]

# Add the XML label to any XML files within the repository
any:
- README.md
- CHANGELOG.md
- CHANGELOG.TXT
- CODE_OF_CONDUCT.md
- CONTRIBUTING.md
- LICENSE
- SUPPORT.md
- Wiki.md
XML:
- [DogApparel/1.4/Defs/*.xml]

any:
- DogApparel/1.4/Defs/*.xml
- DogApparel/patches/Defs/*.xml
- DogApparel/About/About.xml
- DogApparel/LoadFolders.xml
configuration:
- .github/*yml
- .gitignore
- .gitattributes
- .vscode/*
- .devcontainer/*
- .editorconfig
- yamllint.yml
any:
- .github/*yml
- .gitignore
- .gitattributes
- .vscode/*
- .devcontainer/*
- .editorconfig
- yamllint.yml
- .trunk/configs
- DogApparel/.trunk/trunk.yaml
images:
- public/**/*.{ico,svg,jpg,jpeg,png,gif}
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
github:
- any: [.github/*, .github/workflows/]
any:
- .github/*
- .github/workflows/*
github_actions:
- .github/workflows/*
any:
- .github/workflows/*.yml
- .github/workflows/*.yaml
policy:
- .github/ISSUE_TEMPLATE/*
- .github/PULL_TEMPLATE/*
- LICENSE
- SECURITY.md
any:
- .github/ISSUE_TEMPLATE/*
- .github/PULL_TEMPLATE/*
- LICENSE
- SECURITY.md
- CODE_OF_CONDUCT.md
- CONTRIBUTING.md
- SUPPORT.md
vscode:
- .vscode/*
- .vscode/*
21 changes: 21 additions & 0 deletions .github/workflows/auto-assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
jobs:
run:
permissions:
issues: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Auto-assign issue
uses: pozil/[email protected]
with:
abortIfPreviousAssignees: false
allowSelfAssign: true
assignees: Chunnyluny
numOfAssignee: 1
removePreviousAssignees: false
repo-token: ${{ secrets.GITHUB_TOKEN }}
on:
issues:
types: [opened, edited, labeled, reopened]
pull_request:
types: [opened, edited, labeled, synchronize, reopened]
18 changes: 18 additions & 0 deletions .github/workflows/cache_trunk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
jobs:
cache_trunk:
name: Cache Trunk
permissions:
actions: read
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Trunk Check
uses: trunk-io/trunk-action@v1
with:
check-mode: populate_cache_only
on:
push:
branches: master
paths: .trunk/trunk.yaml
5 changes: 3 additions & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: "Pull Request Labeler"
name: Pull Request Labeler

on:
pull_request_target:
workflow_dispatch:
Expand All @@ -15,7 +16,7 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v3
with:
repository: "Chunnyluny/DogApparel"
repository: Chunnyluny-RimWorld-Modding/DogApparel

- name: Label Pull Request
id: label-the-PR
Expand Down
21 changes: 11 additions & 10 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
version: 0.1
cli:
version: 1.15.0
plugins:
sources:
- id: trunk
ref: v1.2.2
uri: https://github.com/trunk-io/plugins
runtimes:
enabled:
- [email protected]
- [email protected]
lint:
enabled:
- [email protected]
Expand All @@ -21,3 +11,14 @@ lint:
- [email protected]
- [email protected]
- [email protected]

plugins:
sources:
- id: trunk
ref: v1.2.2
uri: https://github.com/trunk-io/plugins
runtimes:
enabled:
- [email protected]
- [email protected]
version: 0.1
173 changes: 63 additions & 110 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,111 +1,64 @@
"commit-message-editor.staticTemplate": [
"feat: Short description",
"",
"Message body",
"",
"Message footer"
],
"commit-message-editor.dynamicTemplate": [
"{type}{scope}: {description}",
"",
"{body}",
"",
"{breaking_change}{footer}"
],
"commit-message-editor.tokens": [
{
"label": "Type",
"name": "type",
"type": "enum",
"options": [
{
"label": "---",
"value": ""
},
{
"label": "build",
"description": "Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)"
},
{
"label": "chore",
"description": "Updating grunt tasks etc; no production code change"
},
{
"label": "ci",
"description": "Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)"
},
{
"label": "docs",
"description": "Documentation only changes"
},
{
"label": "feat",
"description": "A new feature"
},
{
"label": "fix",
"description": "A bug fix"
},
{
"label": "perf",
"description": "A code change that improves performance"
},
{
"label": "refactor",
"description": "A code change that neither fixes a bug nor adds a feature"
},
{
"label": "revert"
},
{
"label": "style",
"description": "Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)"
},
{
"label": "test",
"description": "Adding missing tests or correcting existing tests"
}
],
"description": "Type of changes"
},
{
"label": "Scope",
"name": "scope",
"description": "A scope may be provided to a commit’s type, to provide additional contextual information and is contained within parenthesis, e.g., \"feat(parser): add ability to parse arrays\".",
"type": "text",
"multiline": false,
"prefix": "(",
"suffix": ")"
},
{
"label": "Short description",
"name": "description",
"description": "Short description in the subject line.",
"type": "text",
"multiline": false
},
{
"label": "Body",
"name": "body",
"description": "Optional body",
"type": "text",
"multiline": true,
"lines": 5,
"maxLines": 10
},
{
"label": "Breaking change",
"name": "breaking_change",
"type": "boolean",
"value": "BREAKING CHANGE: ",
"default": false
},
{
"label": "Footer",
"name": "footer",
"description": "Optional footer",
"type": "text",
"multiline": true
}
]
{
"terminal.integrated.tabFocusMode": false,
"workbench.productIconTheme": "emoji-product-icons",
"codeium.aggressiveShutdown": true,
"codeium.enableSearch": true,
"codeium.enableConfig": {
"*": true
},
"commit-message-editor.view.saveAndClose": true,
"auto-close-tag.fullMode": true,
"auto-close-tag.insertSpaceBeforeSelfClosingTag": true,
"auto-close-tag.SublimeText3Mode": true,
"debug.confirmOnExit": "always",
"terminal.integrated.confirmOnExit": "always",
"terminal.integrated.confirmOnKill": "always",
"window.confirmBeforeClose": "always",
"explorer.confirmUndo": "verbose",
"projectManager.confirmSwitchOnActiveWindow": "onlyUsingSideBar",
"editor.fontSize": 12,
"editor.codeLensFontFamily": "Consolas, 'Courier New', monospace",
"editor.inlayHints.fontFamily": "Consolas, 'Courier New', monospace",
"scm.inputFontSize": 12,
"debug.console.fontFamily": "Consolas, 'Courier New', monospace",
"debug.console.fontSize": 12,
"markdown.preview.fontSize": 12,
"notebook.output.fontFamily": "Consolas, 'Courier New', monospace",
"terminal.integrated.fontFamily": "Consolas, 'Courier New', monospace",
"terminal.integrated.fontSize": 12,
"chat.editor.fontFamily": "Consolas, 'Courier New', monospace",
"chat.editor.fontSize": 12,
"chat.editor.fontWeight": "normal",
"csv-edit.fontFamilyInTable": "sameAsCodeEditor",
"csv-edit.fontSizeInPx": 12,
"errorLens.fontFamily": "Consolas, 'Courier New', monospace",
"errorLens.fontSize": "Consolas, 'Courier New', monospace",
"errorLens.fontStyleItalic": true,
"editor.formatOnType": true,
"commit-message-editor.view.useMonospaceEditor": true,
"explorer.fileNesting.enabled": true,
"search.quickOpen.includeSymbols": true,
"search.searchEditor.reusePriorSearchConfiguration": true,
"search.showLineNumbers": true,
"search.smartCase": true,
"search.useGlobalIgnoreFiles": true,
"search.useParentIgnoreFiles": true,
"debug.console.closeOnEnd": true,
"editor.bracketPairColorization.independentColorPoolPerBracketType": true,
"editor.codeActionsOnSave": {
"*": true
},
"editor.defaultColorDecorators": true,
"window.autoDetectColorScheme": true,
"terminal.integrated.tabs.defaultColor": "terminal.ansiMagenta",
"markdown-preview-github-styles.colorTheme": "system",
"xmlTools.enableXmlTreeViewCursorSync": true,
"editor.suggest.localityBonus": true,
"editor.cursorStyle": "block-outline",
"workbench.iconTheme": "eq-material-theme-icons-darker",
"yaml.schemas": {
"file:///c%3A/Users/chunl/.vscode/extensions/docsmsft.docs-yaml-1.0.1/dist/toc.schema.json": "/toc\\.yml/i"
},
"redhat.telemetry.enabled": true,
}

24 changes: 12 additions & 12 deletions 1.4/Defs/ThingDef_Apparel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ThingDef ParentName="ArmorMachineableBase">
<defName>Apparel_BasicHarness</defName>
<label>Basic Dog Harness</label>
<description>A basic dog harness that protect dogs against </description>
<description>A basic dog harness that is cheaper than an animal flak armour in stuffcost and available when Complex Clothing is researched.</description>
<techLevel>Industrial</techLevel>
<recipeMaker>
<researchPrerequisite>ComplexClothing</researchPrerequisite>
Expand Down Expand Up @@ -57,17 +57,17 @@
<li>Husky</li>
<li>LabradorRetriever</li>
<li>YorkShireTerrier</li>
<li MayRequire="mod.idname">DefName</li>
<li MayRequire="mod.idname">DefName</li>
<li MayRequire="mod.idname">DefName</li>
<li MayRequire="mod.idname">DefName</li>
<li MayRequire="mod.idname">DefName</li>
<li MayRequire="mod.idname">DefName</li>
<li MayRequire="mod.idname">DefName</li>
<li MayRequire="mod.idname">DefName</li>
<li>Rottweiler</li>
<li>ShihTzu</li>
<li>WelshTerrier</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.Beagle</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.Chihuahua</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.Corgi</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.FrenchBulldog</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.GermanShepherd</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.GreatDane</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.Poodle</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.Pug</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.Rottweiler</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.ShihTzu</li>
<li MayRequire="vanillaexpanded.vanillaanimalsexpanded">AEXP.WelshTerrier</li>
</tags>
</apparel>
<colorGenerator Class="ColorGenerator_Options">
Expand Down

0 comments on commit e58c5e3

Please sign in to comment.