Skip to content

Commit

Permalink
Merge pull request #33 from ublue-os/maintenance
Browse files Browse the repository at this point in the history
chore: add github templates, git cleanup task and a style correction in the docs
  • Loading branch information
tepene authored May 4, 2024
2 parents e2115bf + b873620 commit c3ed45a
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 16 deletions.
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Bug Report
description: Report an issue about using forge
labels: [bug]
body:
- type: markdown
attributes:
value: |
Thank you for taking the time to fill out this bug report!
- type: textarea
id: describe-bug
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is.
placeholder: Tell us what happened!
value: "When I entered 2 + 2, I got the answer 6."
validations:
required: true
- type: textarea
id: expected-behavior
attributes:
label: What did you expect to happen?
description: A clear and concise description of what you expected to happen.
placeholder: What were you expecting to happen?
value: "I expected 2 + 2 to equal 4, but instead 2 + 2 equaled 6!"
validations:
required: true
- type: textarea
id: extra-context
attributes:
label: Extra information or context
description: Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Feature Request
description: Request a new feature to be included in the forge tool set
labels: [enhancement]
body:
- type: markdown
attributes:
value: |
Thank you for taking the time to fill out this feature request
- type: textarea
id: describe-feature
attributes:
label: Describe the feature
description: Include why you feel this should be in the forge
placeholder: Tell us what you need
value: "I'd like this project to be enhanced with ... because ..."
validations:
required: true
20 changes: 5 additions & 15 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,9 @@
"version": "2.0.0",
"tasks": [
{
"label": "Git: Fetch upstream",
"type": "shell",
"command": "git fetch upstream",
"options": {
"cwd": "${workspaceFolder}"
}
},
{
"label": "Git: Merge from upstream",
"type": "shell",
"command": "git merge --no-ff --no-commit upstream/main",
"options": {
"cwd": "${workspaceFolder}"
}
"label": "Git: Cleanup",
"dependsOn": ["Git: Delete merged branches", "Git: Prune remote"],
"problemMatcher": []
},
{
"label": "Git: Delete merged branches",
Expand All @@ -35,5 +24,6 @@
"cwd": "${workspaceFolder}"
}
}
]
],
"inputs": []
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ just -f forge.just {{ recipe_name }} {{ forge_config_var_file }}
**_Example:_**

```sh
just -f forge.just forge_project-clone /var/home/stephan/ublue-os_forge/my-forge-project.env
just -f forge.just forge_project-clone ~/ublue-os_forge/my-forge-project.env
```

In case you don't have [just command runner](https://github.com/casey/just) available.
Expand Down

0 comments on commit c3ed45a

Please sign in to comment.