Skip to content

Commit 715cbc6

Browse files
committed
docs: update contributing and cross-link docs
1 parent f0beb38 commit 715cbc6

File tree

2 files changed

+59
-37
lines changed

2 files changed

+59
-37
lines changed

CONTRIBUTING.md

+50-37
Original file line numberDiff line numberDiff line change
@@ -16,102 +16,115 @@
1616
<!-- /TOC -->
1717

1818
# Contributing
19+
1920
<a id="markdown-contributing" name="contributing"></a>
20-
*Detailed expectations for those contributing to this repository. A documented branching strategy is recommended. Trunk based development as default.*
21+
_Detailed expectations for those contributing to this repository. A documented branching strategy is recommended. Trunk based development as default._
2122

2223
This project uses a [git-flow based development](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) branching strategy.
2324

2425
[Trunk-based Development vs. Git Flow](https://www.toptal.com/software/trunk-based-development-git-flow)
2526

2627
## Branches
28+
2729
<a id="markdown-branches" name="branches"></a>
28-
*Branch naming must be consistent and must be in [kebab-case](https://en.toolpage.org/tool/kebabcase). The following pattern is recommended -*
30+
_Branch naming must be consistent and must be in [kebab-case](https://en.toolpage.org/tool/kebabcase). The following pattern is recommended -_
2931

30-
- feature-[Issue Number]/* - Feature additions
31-
- bugfix-[Issue Number]/* - Bug fixes
32-
- chore-[Issue Number]/* - Chore tasks
33-
- doc-[Issue Number]/* - Documentation tasks
32+
- feature-[Issue Number]/\* - Feature additions
33+
- bugfix-[Issue Number]/\* - Bug fixes
34+
- chore-[Issue Number]/\* - Chore tasks
35+
- doc-[Issue Number]/\* - Documentation tasks
3436
- release/[release-version] - Release versioning
3537

3638
For example,
39+
3740
- feature-27/setup-postgresql
3841
- release/1.0
3942

4043
## Commits
44+
4145
<a id="markdown-commits" name="commits"></a>
42-
*Consistent, verbose commits reduce the need for additional documentation. May be used for generating changelogs. Detailed instructions must be included either through a documented specification or custom documentation.*
46+
_Consistent, verbose commits reduce the need for additional documentation. May be used for generating changelogs. Detailed instructions must be included either through a documented specification or custom documentation._
4347

4448
This project uses the [conventional commit](https://www.conventionalcommits.org/en/v1.0.0-beta.4/) specification for commits.
4549

4650
https://github.com/talos-systems/conform
4751

4852
### Use the Imperative
53+
4954
<a id="markdown-use-the-imperative" name="use-the-imperative"></a>
50-
*Consistent tense in commit messages.*
55+
_Consistent tense in commit messages._
5156

5257
In keeping with the standard output of git itself, all commit subject lines must be written using the imperative:
5358

54-
Your commit subject line must be able to complete the sentence
59+
Your commit subject line must be able to complete the sentence
5560

5661
> If applied, this commit will ...
5762
58-
If it doesn't, it's non-conformant. The body may use any style you want.
63+
If it doesn't, it's non-conformant. The body may use any style you want.
5964

6065
### Use the Body to Explain the Background and Reasoning, not the Implementation
66+
6167
<a id="markdown-use-the-body-to-explain-the-background-and-reasoning-not-the-implementation" name="use-the-body-to-explain-the-background-and-reasoning-not-the-implementation"></a>
6268

63-
*Especially* if the diff is rather large or extremely clustered, you can save all fellow developers some time by explaining *why* you did *what*.
69+
_Especially_ if the diff is rather large or extremely clustered, you can save all fellow developers some time by explaining _why_ you did _what_.
6470

6571
When possible the addition of screenshots, recorded gifs or other visual media is recommended.
6672

6773
### Subject Line Standard Terminology
74+
6875
<a id="markdown-subject-line-standard-terminology" name="subject-line-standard-terminology"></a>
6976

70-
First Word | Meaning
71-
--- | --
72-
Add | Create a capability e.g. feature, test, dependency.
73-
Cut | Remove a capability e.g. feature, test, dependency.
74-
Fix | Fix an issue e.g. bug, typo, accident, misstatement.
75-
Bump | Increase the version of something e.g. dependency.
76-
Make | Change the build process, or tooling, or infra.
77-
Start | Begin doing something; e.g. create a feature flag.
78-
Stop | End doing something; e.g. remove a feature flag.
79-
Refactor | A code change that MUST be just a refactoring.
80-
Reformat | Refactor of formatting, e.g. omit whitespace.
81-
Optimize | Refactor of performance, e.g. speed up code.
82-
Document | Refactor of documentation, e.g. help files.
77+
| First Word | Meaning |
78+
| ---------- | ---------------------------------------------------- |
79+
| Add | Create a capability e.g. feature, test, dependency. |
80+
| Cut | Remove a capability e.g. feature, test, dependency. |
81+
| Fix | Fix an issue e.g. bug, typo, accident, misstatement. |
82+
| Bump | Increase the version of something e.g. dependency. |
83+
| Make | Change the build process, or tooling, or infra. |
84+
| Start | Begin doing something; e.g. create a feature flag. |
85+
| Stop | End doing something; e.g. remove a feature flag. |
86+
| Refactor | A code change that MUST be just a refactoring. |
87+
| Reformat | Refactor of formatting, e.g. omit whitespace. |
88+
| Optimize | Refactor of performance, e.g. speed up code. |
89+
| Document | Refactor of documentation, e.g. help files. |
8390

8491
## Documentation
92+
8593
<a id="markdown-documentation" name="documentation"></a>
86-
*Documentation must be treated as an integral aspect of development. This section describes expectations for documentation rigor and placement.*
94+
_Documentation must be treated as an integral aspect of development. This section describes expectations for documentation rigor and placement._
8795

8896
In cases where the impact of a change is such that it is affects a fundamental component of the system, additional documentation is needed above what is presented in commit messages. This is by discretion, but it is advised to err on the side of more documentation than less.
8997

9098
In these cases, documentation should be added as markdown files within the project directory.
9199

92100
## Code Review
101+
93102
<a id="markdown-code-review" name="code-review"></a>
94-
*Expectations for conducting code reviews, the merger of code and subesquent tasks*
103+
_Expectations for conducting code reviews, the merger of code and subesquent tasks_
95104

96105
Pull requests require a minimum of one reviewer to accept changes prior to merge. It is the responsibility of the person submitting the pull request to schedule a code review.
97106

98107
[Google Engineering - Code Review Developer Guide](https://google.github.io/eng-practices/review/)
99108

100109
## Deploy
110+
101111
<a id="markdown-deploy" name="deploy"></a>
102-
*Deployment steps from the perspective of an engineer required to deploy to all of the available evironments.*
112+
_Deployment steps from the perspective of an engineer required to deploy to all of the available evironments._
103113

104114
Once a pull request is merged the change will be automatically deployed to the appropriate environment.
105115

106116
# Task Workflow
117+
107118
<a id="markdown-task-workflow" name="task-workflow"></a>
108-
*Description of how tasks are tracked through project management software and expectations of different roles.*
119+
_Description of how tasks are tracked through project management software and expectations of different roles._
109120

110121
![Task Workflow Diagram](task%20workflow.png)
111122

112123
# Definition of Done
124+
113125
<a id="markdown-definition-of-done" name="definition-of-done"></a>
114126
A task is complete when
127+
115128
- All acceptance criteria have been met
116129
- Implementation has been code reviewed
117130
- All automated tests pass (e.g: Unit, end-to-end testing)
@@ -120,14 +133,14 @@ A task is complete when
120133
- Implementation is deployed to the appropriate environment
121134

122135
# Technologies Used and Dev Setup
136+
123137
<a id="markdown-technologies-used-and-dev-setup" name="technologies-used-and-dev-setup"></a>
124138
The following technologies are required for development
125-
- Install NVM, use NVM to install latest version of Node.js
126-
- Java 14
127-
- Micronaut 2.0 or above
128-
- Docker (latest version)
129-
- Gradle 6.3
130-
131-
*Note - If you are getting a error of
132-
`org.postgresql.util.PSQLException: FATAL: database "checkinsdb" does not exist`
133-
you will need to delete your local copy of postgres and only use the docker version*
139+
140+
- Node.js
141+
- Java
142+
- Micronaut
143+
- Podman or Docker
144+
- Gradle
145+
146+
For instructions on setting up your development environment, see [Setting up your environment](https://objectcomputing.github.io/check-ins/getting-started/setup/).
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
title: Troubleshooting
3+
parent: Setup
4+
grand_parent: Getting Started
5+
---
6+
7+
_Note - If you are getting a error of
8+
`org.postgresql.util.PSQLException: FATAL: database "checkinsdb" does not exist`
9+
you will need to delete your local copy of postgres and only use the docker version_

0 commit comments

Comments
 (0)