You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/bug_report.md
+4-2Lines changed: 4 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -27,8 +27,10 @@ assignees: ''
27
27
-->
28
28
29
29
---
30
+
30
31
#### Contributor Guide and Resources
32
+
31
33
- 📚 [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/)
33
35
- 🎨 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)
Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/ci.md
+4-2Lines changed: 4 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -18,8 +18,10 @@ assignees: ''
18
18
<!-- Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->
19
19
20
20
---
21
+
21
22
#### Contributor Guide and Resources
23
+
22
24
- 📚 [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/)
24
26
- 🎨 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)
Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/documentation.md
+3-4Lines changed: 3 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -7,14 +7,13 @@ assignees: ''
7
7
---
8
8
### Current State
9
9
10
-
11
10
### Desired State
12
11
13
-
14
12
---
15
13
16
14
#### Contributor Guide and Resources
15
+
17
16
- 📚 [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/)
19
18
- 🎨 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)
Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/feature_request.md
+3-2Lines changed: 3 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -21,7 +21,8 @@ assignees: ''
21
21
<!-- [Optional] Any visual diagrams of the desired user interface. -->
22
22
23
23
---
24
+
24
25
- 📚 [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/)
26
27
- 🎨 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)
Copy file name to clipboardExpand all lines: CODE_OF_CONDUCT.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -2,4 +2,4 @@
2
2
3
3
The Layer5 community follows the code of conduct outlined in the [Community Handbook]([https://layer5.io](https://layer5.io/community/handbook/code-of-conduct).
4
4
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]>.
Copy file name to clipboardExpand all lines: CONTRIBUTING-gitflow.md
+24-1Lines changed: 24 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,41 +1,53 @@
1
1
# Working by Forking
2
+
2
3
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:
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:
("meshery" is used as the example repo. Be sure to reference the _actual_ repo you're contributing to e.g. "meshery-linkerd").
16
21
17
22
## Verify the new remote named 'upstream'
23
+
18
24
```
19
25
git remote -v
20
26
```
27
+
21
28
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:
22
29
23
30
## Fetch from upstream remote
31
+
24
32
```
25
33
git fetch upstream
26
34
```
27
35
28
36
## View all branches, including those from upstream
37
+
29
38
```
30
39
git branch -va
31
40
```
41
+
32
42
Now, checkout your own master branch and merge the upstream repo's master branch:
33
43
34
44
## Checkout your master branch and merge upstream
45
+
35
46
```
36
47
git checkout master
37
48
git merge upstream/master
38
49
```
50
+
39
51
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.
40
52
41
53
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
46
58
To create a new branch and start working on it, peform the following flow.
47
59
48
60
## Checkout the master branch - you want your new branch to come from master
61
+
49
62
```
50
63
git checkout master
51
64
```
52
65
53
66
## Create a new branch (give your branch its own simple informative name)
67
+
54
68
For enhancements use `feature/your_username/issue#` or `feature/your_username/name_of_feature`
55
69
56
70
For bugs use `bug/your_username/issue#` or `bug/your_username/name_of_bug`
@@ -60,36 +74,45 @@ git branch feature/jdoe/567
60
74
```
61
75
62
76
## Switch to your new branch
77
+
63
78
```
64
79
git checkout feature/jdoe/567
65
80
```
81
+
66
82
Now, go to town hacking away and making whatever changes you want to.
67
83
68
84
## Submitting your changes (a Pull Request)
85
+
69
86
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.
70
87
71
88
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.
72
89
73
90
## Fetch upstream master and merge with your repo's master branch
91
+
74
92
```
75
93
git fetch upstream
76
94
git checkout master
77
95
git merge upstream/master
78
96
```
79
97
80
98
## If there were any new commits, rebase your development branch
99
+
81
100
```
82
101
git checkout feature/jdoe/567
83
102
git rebase master
84
103
```
104
+
85
105
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:
86
106
87
107
## Rebase all commits on your development branch
108
+
88
109
```
89
110
git checkout
90
111
git rebase -i master
91
112
```
113
+
92
114
This will open up a text editor where you can specify which commits to squash.
93
115
94
116
## Submitting
117
+
95
118
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.
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+10-7Lines changed: 10 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -26,38 +26,41 @@ information on using pull requests.
26
26
27
27
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.
28
28
29
-
1.**Directory Setup**
29
+
1.**Directory Setup**
30
30
31
31
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
+
32
33
```
33
34
my-academy-content/
34
35
├── academy-example/ <-- Your content project
35
36
└── academy-theme/ <-- This theme project
36
37
```
37
38
38
-
2. **Modify `go.mod`**
39
+
2. **Modify `go.mod`**
39
40
40
41
In your site's (`academy-example/`) `go.mod` file, add the following `replace` directive to point to your local theme folder:
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.
47
49
48
50
## Updating the Theme
49
51
50
52
To ensure you have the latest version of the theme or to upgrade to a newer release, follow these steps:
51
53
52
-
1. **Update Go Module**
54
+
1. **Update Go Module**
53
55
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
+
54
57
```bash
55
58
go get -u github.com/layer5io/academy-theme
56
59
```
57
-
This command will fetch the latest version of the theme and update your `go.mod` and `go.sum` files accordingly.
58
60
61
+
This command will fetch the latest version of the theme and update your `go.mod` and `go.sum` files accordingly.
59
62
60
-
2. **Rebuild Your Site**
63
+
2. **Rebuild Your Site**
61
64
After updating the theme, rebuild your Hugo site to incorporate the changes:
62
65
63
66
```bash
@@ -73,4 +76,4 @@ To ensure you have the latest version of the theme or to upgrade to a newer rele
73
76
Your site should now be running with the updated theme.
74
77
75
78
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)
0 commit comments