Skip to content

Commit 8debeed

Browse files
committed
chore: update issue templates and contributing documents for clarity and consistency
Signed-off-by: Lee Calcote <[email protected]>
1 parent 903bf9b commit 8debeed

File tree

13 files changed

+75
-31
lines changed

13 files changed

+75
-31
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ assignees: ''
2727
-->
2828

2929
---
30+
3031
#### Contributor Guide and Resources
32+
3133
- 📚 [Instructions for contributing to academy-theme](https://github.com/layer5io/academy-theme/blob/master/CONTRIBUTING.md)
32-
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
34+
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
3335
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
34-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
36+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/ci.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ assignees: ''
1818
<!-- Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->
1919

2020
---
21+
2122
#### Contributor Guide and Resources
23+
2224
- 📚 [Instructions for contributing to academy-theme](https://github.com/layer5io/academy-theme/blob/master/CONTRIBUTING.md)
23-
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
25+
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
2426
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
25-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
27+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ assignees: ''
77
---
88
### Current State
99

10-
1110
### Desired State
1211

13-
1412
---
1513

1614
#### Contributor Guide and Resources
15+
1716
- 📚 [Instructions for contributing to academy-theme](https://github.com/layer5io/academy-theme/blob/master/CONTRIBUTING.md)
18-
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
17+
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
1918
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
20-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
19+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ assignees: ''
2121
<!-- [Optional] Any visual diagrams of the desired user interface. -->
2222

2323
---
24+
2425
- 📚 [Instructions for contributing to academy-theme](https://github.com/layer5io/academy-theme/blob/master/CONTRIBUTING.md)
25-
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
26+
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
2627
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
27-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
28+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22

33
This PR fixes #
44

5-
6-
7-
85
**[Signed commits](../blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin)**
6+
97
- [ ] Yes, I signed my commits.
10-
118

129
<!--
1310
Thank you for contributing to Meshery!

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
The Layer5 community follows the code of conduct outlined in the [Community Handbook]([https://layer5.io](https://layer5.io/community/handbook/code-of-conduct).
44

5-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting [email protected].
5+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting <[email protected]>.

CONTRIBUTING-gitflow.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,53 @@
11
# Working by Forking
2+
23
Just head over to the GitHub page and click the "Fork" button. It's just that simple. Once you've done that, you can use your favorite git client to clone your repo or just head straight to the command line:
34

45
## Clone your fork to your local machine
6+
57
```
68
git clone [email protected]:USERNAME/FORKED-PROJECT.git
79
```
10+
811
Keeping Your Fork Up to Date
912
While this isn't an absolutely necessary step, if you plan on doing anything more than just a tiny quick fix, you'll want to make sure you keep your fork up to date by tracking the original "upstream" repo that you forked. To do this, you'll need to add a remote:
1013

1114
## Add 'upstream' repo to list of remotes
15+
1216
```
1317
git remote add upstream https://github.com/layer5io/meshery.git
14-
```
18+
```
19+
1520
("meshery" is used as the example repo. Be sure to reference the _actual_ repo you're contributing to e.g. "meshery-linkerd").
1621

1722
## Verify the new remote named 'upstream'
23+
1824
```
1925
git remote -v
2026
```
27+
2128
Whenever you want to update your fork with the latest upstream changes, you'll need to first fetch the upstream repo's branches and latest commits to bring them into your repository:
2229

2330
## Fetch from upstream remote
31+
2432
```
2533
git fetch upstream
2634
```
2735

2836
## View all branches, including those from upstream
37+
2938
```
3039
git branch -va
3140
```
41+
3242
Now, checkout your own master branch and merge the upstream repo's master branch:
3343

3444
## Checkout your master branch and merge upstream
45+
3546
```
3647
git checkout master
3748
git merge upstream/master
3849
```
50+
3951
If there are no unique commits on the local master branch, git will simply perform a fast-forward. However, if you have been making changes on master (in the vast majority of cases you probably shouldn't be - see the next section, you may have to deal with conflicts. When doing so, be careful to respect the changes made upstream.
4052

4153
Now, your local master branch is up-to-date with everything modified upstream.
@@ -46,11 +58,13 @@ Whenever you begin work on a new feature or bugfix, it's important that you crea
4658
To create a new branch and start working on it, peform the following flow.
4759

4860
## Checkout the master branch - you want your new branch to come from master
61+
4962
```
5063
git checkout master
5164
```
5265

5366
## Create a new branch (give your branch its own simple informative name)
67+
5468
For enhancements use `feature/your_username/issue#` or `feature/your_username/name_of_feature`
5569

5670
For bugs use `bug/your_username/issue#` or `bug/your_username/name_of_bug`
@@ -60,36 +74,45 @@ git branch feature/jdoe/567
6074
```
6175

6276
## Switch to your new branch
77+
6378
```
6479
git checkout feature/jdoe/567
6580
```
81+
6682
Now, go to town hacking away and making whatever changes you want to.
6783

6884
## Submitting your changes (a Pull Request)
85+
6986
Prior to submitting your pull request, you might want to do a few things to clean up your branch and make it as simple as possible for the original repo's maintainer to test, accept, and merge your work.
7087

7188
In the time that you've been working on your changes, if any commits have been made to the upstream master branch, you will need to rebase your development branch so that merging it will be a simple fast-forward that won't require any conflict resolution work.
7289

7390
## Fetch upstream master and merge with your repo's master branch
91+
7492
```
7593
git fetch upstream
7694
git checkout master
7795
git merge upstream/master
7896
```
7997

8098
## If there were any new commits, rebase your development branch
99+
81100
```
82101
git checkout feature/jdoe/567
83102
git rebase master
84103
```
104+
85105
Now, it may be desirable to squash some of your smaller commits down into a small number of larger more cohesive commits. You can do this with an interactive rebase:
86106

87107
## Rebase all commits on your development branch
108+
88109
```
89110
git checkout
90111
git rebase -i master
91112
```
113+
92114
This will open up a text editor where you can specify which commits to squash.
93115

94116
## Submitting
117+
95118
Once you've committed and pushed all of your changes to GitHub, go to the page for your fork on GitHub, select your development branch, and click the pull request button. If you need to make any adjustments to your pull request, just push the updates to GitHub. Your pull request will automatically track the changes on your development branch and update.

CONTRIBUTING.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,38 +26,41 @@ information on using pull requests.
2626

2727
To develop this theme locally, you can link it to a Hugo site (like the [academy starter template](https://github.com/layer5io/academy-example)) using a `replace` directive in the site's `go.mod` file.
2828

29-
1. **Directory Setup**
29+
1. **Directory Setup**
3030

3131
Ensure you have cloned both this theme repository and your Hugo site repository into the same parent directory. Your folder structure should look like this:
32+
3233
```
3334
my-academy-content/
3435
├── academy-example/ <-- Your content project
3536
└── academy-theme/ <-- This theme project
3637
```
3738
38-
2. **Modify `go.mod`**
39+
2. **Modify `go.mod`**
3940
4041
In your site's (`academy-example/`) `go.mod` file, add the following `replace` directive to point to your local theme folder:
42+
4143
```go
4244
replace github.com/layer5io/academy-theme => ../academy-theme
4345
```
4446
45-
3. **Run the Server**
47+
3. **Run the Server**
4648
Now, when you run `make site` from within your site's directory, Hugo will use your local theme files instead of fetching the remote module, allowing you to see your changes live.
4749
4850
## Updating the Theme
4951
5052
To ensure you have the latest version of the theme or to upgrade to a newer release, follow these steps:
5153
52-
1. **Update Go Module**
54+
1. **Update Go Module**
5355
Navigate to your Hugo site's root directory (e.g., `academy-example/`) in your terminal. Run the following command to update the theme module:
56+
5457
```bash
5558
go get -u github.com/layer5io/academy-theme
5659
```
57-
This command will fetch the latest version of the theme and update your `go.mod` and `go.sum` files accordingly.
5860
61+
This command will fetch the latest version of the theme and update your `go.mod` and `go.sum` files accordingly.
5962
60-
2. **Rebuild Your Site**
63+
2. **Rebuild Your Site**
6164
After updating the theme, rebuild your Hugo site to incorporate the changes:
6265
6366
```bash
@@ -73,4 +76,4 @@ To ensure you have the latest version of the theme or to upgrade to a newer rele
7376
Your site should now be running with the updated theme.
7477
7578
For detailed guide, check:
76-
[Creating your learning path – ongoing maintenance and updates](https://docs.layer5.io/cloud/academy/creating-your-learning-path/#6-ongoing-maintenance-and-updates)
79+
[Creating your learning path – ongoing maintenance and updates](https://docs.layer5.io/cloud/academy/creating-your-learning-path/#6-ongoing-maintenance-and-updates)

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@ clean:
3131
hugo --cleanDestinationDir
3232
make site
3333

34+
## Fix Markdown linting issues
35+
lint-fix:
36+
@echo "Checking for markdownlint-cli2..."
37+
@command -v markdownlint-cli2 > /dev/null || { \
38+
echo "markdownlint-cli2 not found. Attempting to install globally..."; \
39+
command -v npm > /dev/null || { echo "npm is not installed. Please install Node.js/npm and re-run 'make lint-fix'."; exit 1; }; \
40+
npm install -g markdownlint-cli2; \
41+
}
42+
@echo "Running markdownlint-cli2 --fix..."
43+
@markdownlint-cli2 --fix "**/*.md" "#node_modules" "#public" "#resources"
44+
45+
3446
check-go:
3547
@echo "Checking if Go is installed..."
3648
@command -v go > /dev/null || (echo "Go is not installed. Please install it before proceeding."; exit 1)

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ The recommended approach to use this theme is through the academy starter templa
55

66
## Getting started with this theme
77

8-
98
The recommended approach to use this theme is through the academy starter template .

0 commit comments

Comments
 (0)