Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Commit e7329d9

Browse files
committed
resolve merge conflict
2 parents e6ae188 + ee87894 commit e7329d9

25 files changed

Lines changed: 241 additions & 143 deletions

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
A course about Innersource basics within an organization.
1+
Organizations of all sizes and in all industries are chatting about innersource concepts. This course walks you through some of the key concepts of innersource and helps you build up an internal toolkit for adopting innersource practices.
2+
3+
After completing this course, you'll be able to:
4+
- contrast user versus organization owned projects
5+
- make recommendations about the number of GitHub organizations you should have
6+
- create discoverable repositories
7+
- create robust repository READMEs
8+
- use issue and pull request templates
9+
- build transparency into repositories
10+
- measure the success of innersource within your organization
11+
- distribute your innersource toolkit

config.yml

Lines changed: 93 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,66 @@
11
title: Discover and reuse projects within your organization
2-
tagline: Discover and reuse projects within your organization
3-
description: Discover and reuse projects within your organization
2+
tagline: High level yet impactful innersource concepts to help transform your organization.
3+
description: Organizations of all sizes and in all industries are chatting about innersource concepts. This course walks you through some of the key concepts of innersource and helps you build up an internal toolkit for adopting innersource practices.
44
template:
55
name: innersource
66
repo: innersource-template
77
before:
88
- type: createIssue
99
title: Welcome
10-
body: welcome.md
10+
body: 00_welcome.md
11+
- type: updateBranchProtection
12+
13+
# Course artifacts:
14+
# 1. Issue: Welcome
15+
# 2. PR: Repository ownership and names
16+
# 3. PR: Create discoverable repos
17+
# 4. PR: Issue and PR templates
18+
# 5. PR: Workflows
19+
# 6. PR: Managing projects on GitHub
20+
# 7. PR: Measuring success
21+
# 8: Issue: Publish your toolkit
1122

1223
steps:
1324

1425
#1
1526
- title: Answer your first challenge question
16-
description: Answer your first challenge question
27+
description: Determine the differences between open source and innersource.
1728
link: '{{ repoUrl }}/issues/1'
1829
event: issues.edited
1930
actions:
20-
- type: respond
21-
with: innersource-v-opensource.md
22-
- type: closeIssue
2331
- type: createPullRequest
2432
title: Repository ownership and names
2533
head: repo-owner
26-
body: repo-owner.md
34+
body: 01_repo-owner.md
2735
action_id: ownerPR
2836
- type: respond
29-
with: goto-pr.md
37+
with: 01_innersource-v-opensource.md
3038
data:
3139
url: '%actions.ownerPR.data.html_url%'
40+
- type: closeIssue
41+
3242

3343
#2
34-
- title: Answer the owner challenge
35-
description: Answer the owner challenge
44+
- title: Answer the ownership challenge
45+
description: Discover how repository ownership affects visibility and access.
46+
link: '{{ repoUrl }}/pull/2'
3647
event: pull_request.edited
3748
actions:
49+
- type: removeBranchProtection
3850
- type: respond
39-
with: repo-owner-answer.md
51+
with: 02_repo-owner-answer.md
4052

4153
#3
42-
- title: Merge the ownership PR
43-
description: Merge the ownership PR
54+
- title: Merge the ownership pull request
55+
description: Beef up your innersource toolkit with resources about repository ownership.
56+
link: '{{ repoUrl }}/pull/2'
4457
event: pull_request.closed
4558
actions:
59+
- type: updateBranchProtection
4660
- type: createPullRequest
4761
title: Create discoverable repos
4862
head: discoverable-repos
49-
body: discoverable.md
63+
body: 03_discoverable.md
5064
action_id: discoverablePR
5165
- type: respond
5266
with: goto-pr.md
@@ -55,21 +69,25 @@ steps:
5569

5670
#4
5771
- title: Answer the discoverability challenge
58-
description: Answer the discoverability challenge
72+
description: Learn about ways to make your repository easy to discover.
73+
link: '{{ repoUrl }}/pull/3'
5974
event: issue_comment.created
6075
actions:
76+
- type: removeBranchProtection
6177
- type: respond
62-
with: discoverability-answer.md
78+
with: 04_discoverability-answer.md
6379

6480
#5
65-
- title: Merge the discoverability PR
66-
description: Merge the discoverability PR
81+
- title: Merge the discoverability pull request
82+
description: Add resources for making discoverable repositories to your innersource toolkit.
83+
link: '{{ repoUrl }}/pull/3'
6784
event: pull_request.closed
6885
actions:
86+
- type: updateBranchProtection
6987
- type: createPullRequest
7088
title: Issue and PR templates
7189
head: templates
72-
body: templates.md
90+
body: 05_templates.md
7391
action_id: templatesPR
7492
- type: respond
7593
with: goto-pr.md
@@ -78,21 +96,25 @@ steps:
7896

7997
#6
8098
- title: Answer the templates challenge question
81-
description: Answer the templates challenge question
99+
description: Determine how template files can help you create easy-to-join projects.
100+
link: '{{ repoUrl }}/pull/4'
82101
event: pull_request.edited
83102
actions:
103+
- type: removeBranchProtection
84104
- type: respond
85-
with: templates-answer.md
105+
with: 06_templates-answer.md
86106

87107
#7
88-
- title: Merge the templates PR
89-
description: Merge the templates PR
108+
- title: Merge the templates pull request
109+
description: Add starter templates to your innersource toolkit.
110+
link: '{{ repoUrl }}/pull/4'
90111
event: pull_request.closed
91112
actions:
113+
- type: updateBranchProtection
92114
- type: createPullRequest
93115
title: Workflows
94116
head: workflows
95-
body: workflows.md
117+
body: 07_workflows.md
96118
action_id: workflowsPR
97119
- type: respond
98120
with: goto-pr.md
@@ -101,21 +123,25 @@ steps:
101123

102124
#8
103125
- title: Answer the workflows challenge question
104-
description: Answer the workflows challenge question
126+
description: Discover how being transparent about your workflow can help others contribute.
127+
link: '{{ repoUrl }}/pull/5'
105128
event: pull_request.edited
106129
actions:
130+
- type: removeBranchProtection
107131
- type: respond
108-
with: workflows-answer.md
132+
with: 08_workflows-answer.md
109133

110134
#9
111-
- title: Project management
112-
description: Project management
135+
- title: Merge the workflows pull request
136+
description: Add branching and workflow strategies to your innersource toolkit.
137+
link: '{{ repoUrl }}/pull/5'
113138
event: pull_request.closed
114139
actions:
140+
- type: updateBranchProtection
115141
- type: createPullRequest
116142
title: Managing projects on GitHub
117143
head: projects
118-
body: projects.md
144+
body: 09_projects.md
119145
action_id: projectsPR
120146
- type: respond
121147
with: goto-pr.md
@@ -124,21 +150,25 @@ steps:
124150

125151
#10
126152
- title: Answer the project management challenge
127-
description: Answer the project management challenge
153+
description: Learn about how you can surface your project management strategies to potential contributors.
154+
link: '{{ repoUrl }}/pull/6'
128155
event: pull_request.edited
129156
actions:
157+
- type: removeBranchProtection
130158
- type: respond
131-
with: projects-answer.md
159+
with: 10_projects-answer.md
132160

133161
#11
134-
- title: Measuring success
135-
description: Measuring success
162+
- title: Merge the project management pull request
163+
description: Beef up your innersource toolkit with project management tips.
164+
link: '{{ repoUrl }}/pull/6'
136165
event: pull_request.closed
137166
actions:
167+
- type: updateBranchProtection
138168
- type: createPullRequest
139169
title: Measuring success
140170
head: metrics
141-
body: metrics.md
171+
body: 11_metrics.md
142172
action_id: metricsPR
143173
- type: respond
144174
with: goto-pr.md
@@ -147,26 +177,42 @@ steps:
147177

148178
#12
149179
- title: Answer the success metrics challenge
150-
description: Answer the success metrics challenge
180+
description: Begin thinking about how to measure the success of your innersource program.
181+
link: '{{ repoUrl }}/pull/7'
151182
event: issue_comment.created
152183
actions:
184+
- type: removeBranchProtection
153185
- type: respond
154-
with: metrics-answer.md
186+
with: 12_metrics-answer.md
155187

156188
#13
157-
- title: Merge the final PR
158-
description: Merge the final PR
189+
- title: Merge the metrics pull request
190+
description: Add possible metrics to your innersource toolkit.
191+
link: '{{ repoUrl }}/pull/7'
159192
event: pull_request.closed
160193
actions:
194+
- type: updateBranchProtection
161195
- type: createIssue
162-
title: Congratulations
163-
body: congratulations.md
164-
action_id: congratulationsIssue
165-
data:
166-
learningPathURL: 'https://github-learning-lab-staging.herokuapp.com/githubtraining/paths/innersource:-theory-to-practice'
167-
forkURL: '%payload.repository.html_url%/fork'
168-
downloadURL: '%payload.repository.html_url%/archive/master.zip'
196+
title: Publish your toolkit
197+
body: 13_publish.md
198+
action_id: publishIssue
169199
- type: respond
170200
with: goto-pr.md
171201
data:
172-
url: '%actions.congratulationsIssue.data.html_url%'
202+
url: '%actions.publishIssue.data.html_url%'
203+
204+
#14
205+
- title: Enable GitHub Pages
206+
description: Publish your innersource toolkit by turning on GitHub Pages.
207+
link: '{{ repoUrl }}/pull/8'
208+
event: deployment
209+
actions:
210+
- type: removeBranchProtection
211+
- type: respond
212+
issue: Publish your toolkit
213+
with: 14_congratulations.md
214+
data:
215+
deploymentURL: 'https://%payload.repository.owner.login%.github.io/%payload.repository.name%'
216+
learningPathURL: 'https://github-learning-lab-staging.herokuapp.com/githubtraining/paths/innersource:-theory-to-practice'
217+
forkURL: '%payload.repository.html_url%/fork'
218+
downloadURL: '%payload.repository.html_url%/archive/master.zip'

responses/00_welcome.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Welcome!
2+
3+
This repository will be a working website that you can publish as your own Innersource commons.
4+
5+
![screenshot of final product](https://user-images.githubusercontent.com/16547949/56064057-f1f17700-5d3e-11e9-9100-9678dc91c544.png)
6+
7+
As we work, we'll create a resource that others can use within your organization. This repository will be useful even after you finish this course.
8+
9+
This is how this course will move along:
10+
- Every new issue or pull request will start with a challenge question
11+
- You'll answer the challenge question _(don't worry, there are no right or wrong answers!)_
12+
- The question will highlight the importance of each topic in Innersource practices
13+
14+
Here's your first challenge question!
15+
16+
### Challenge question
17+
18+
Innersource and open source are the same thing.
19+
20+
- [ ] True
21+
- [ ] False
22+
23+
<hr>
24+
<h3 align="center">I'll respond when you check one of the boxes above.</h3>
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
Innersource and open source are very similar concepts, but they're not the same.
44

5-
**Open source** software is shared publicly and typically accepts contributions from contributors outside of an organization.
5+
**Open source** software public and typically accepts contributions from outside of an organization.
66

7-
**Innersource** is the practice of adopting open source practices internally within your organization. An organization that practices innersource, may or may not end up open sourced.
7+
**Innersource** is the practice of adopting open source practices internally within your organization. An organization that practices innersource, may or may not end up open sourced.
8+
9+
You can find your next steps in the [next pull request]({{ url }}).
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ This pull request is all about repository ownership and naming conventions.
44

55
Does a repository exist at https://github.com/githubtraining/training-manual?
66

7-
- [ ] True, there is a repository at the given URL.
8-
- [ ] False, no repository exists at the given URL.
7+
- [ ] True, there is a repository at the given URL
8+
- [ ] False, no repository exists at the given URL
99

10-
I'll respond when I detect you've checked one of the boxes above.
10+
<hr>
11+
<h3 align="center">I'll respond when you check one of the boxes above.</h3>
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ A repository _does_ exist at githubtraining/training-manual, but it is private.
77
<details>
88
<summary>Why can't you see it then? Review the <b>Files Changed</b> tab and see if you can figure it out. Collapse this text if you'd like an explanation.</summary>
99

10-
The repository `training-manual` in the @githubtraining organization is private, and only visible to memebers of that organization. If you're not a member of the organization, it'll appear like the repository doesn't exist to you. This is an example of why having the right ownership structure is important. Having too many organizations with restrictive permissions means that each organization's work will be siloed.
10+
The repository `training-manual` in the @githubtraining organization is private. It's only visible to members of that organization. If you're not a member of the organization, it'll appear like the repository doesn't exist to you. This is an example of why having the right ownership structure is important. Having too many organizations with restrictive permissions silos and isolates each organization's work.
1111
</summary>
1212

1313
Here are some recommendations based on some :sparkles: use of GitHub that we've seen:
14-
- aim for as few organizations as possible, remember: each organization is a black box to those outside of that organization
15-
- name your repositories in a meaningful manner, usually a simple project or application name will suffice
14+
- Aim for as few organizations as possible. Remember, each organization is a black box to those outside of that organization.
15+
- Name your repositories in a meaningful manner. Usually a simple project or application name will suffice.
1616
</summary>
17+
</details>
1718

18-
Please merge this PR.
19+
Please merge this pull request.
20+
21+
<hr>
22+
<h3 align="center">I'll respond when you merge this pull request.</h3>
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
This PR is all about how to make your repositories more discoverable.
1+
This pull request is all about how to make your repositories more discoverable.
22

33
### Challenge question
44

55
What is this repository for?
66

77
![gif of a repository with no description, link, or and just a few folders: .github, .vscode, _appendix, _events, _includes, _layouts](https://user-images.githubusercontent.com/6351798/56160925-995feb00-5f85-11e9-8a91-a611936c98bd.gif)
88

9-
I'll respond when I detect you've submitted a comment on this PR.
9+
<hr>
10+
<h3 align="center">I'll respond when I detect you comment on this pull request.</h3>
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ This repository is the source code for https://services.github.com.
55
Did you guess it? Probably not, because it doesn't contain many of the necessary elements to make a repository discoverable.
66

77
Some suggestions to ensure your teammates can find your repository are:
8-
- use a descriptive repository name
9-
- give your repository a description
10-
- provide a URL for the deployment of the app, or documentation about this project
8+
- Use a descriptive repository name
9+
- Give your repository a description
10+
- Provide a URL for the deployment of the app, or documentation about this project
1111

1212
Discover more about how to make a repository discoverable by visiting the **Files Changed** tab. It's OK if you want to do this later, any resources we cover throughout the course will be available at the end.
1313

14-
Please merge this PR.
14+
Please merge this pull request.
15+
16+
<hr>
17+
<h3 align="center">I'll respond when you merge this pull request.</h3>
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Here are four different ways you could submit a bug report. Which is the _right_
77
- [ ] Open an issue on GitHub
88
- [ ] Create a Jira issue
99
- [ ] Open an internal support ticket
10-
- [ ] DM or email the maintainer
10+
- [ ] Direct message or email the maintainer
1111

12-
I'll respond when you check one of the boxes above.
12+
<hr>
13+
<h3 align="center">I'll respond when you check one of the boxes above.</h3>

0 commit comments

Comments
 (0)