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
{{ message }}
This repository was archived by the owner on Aug 6, 2025. It is now read-only.
Copy file name to clipboardExpand all lines: README.md
+8-7Lines changed: 8 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -57,16 +57,16 @@ Development in this repository can be done via forks or branches. Currently, we
57
57
In general, the git workflow within this repository loosely follows https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow .
58
58
59
59
### Meta
60
-
`Meta` contains various makefiles and .yaml files used for configuration.
60
+
`meta` contains various makefiles and .yaml files used for configuration.
61
61
Changes or additions to/of makefiles and .yaml for publishing purposes should be performed against this branch.
62
-
There is no general requirement to keep `Meta` up to date with `Master` or `Integration`.
62
+
There is no general requirement to keep `meta` up to date with `master` or `integration`.
63
63
64
64
### Integration
65
-
`Integration` is treated as a running feature branch that should **always** remain up to date with `master`
65
+
`integration` is treated as a running feature branch that should **always** remain up to date with `master`.
66
66
67
67
### Master
68
-
`Master` is treated as our production state branch. In general, pull requests to master should be opened only from integration or a hot-fix feature branch.
69
-
If a change is merged into `Master` that is not present in `Integration`, in general, that change should be merged as well from said branch or fork into integration.
68
+
`master` is treated as our production state branch. In general, pull requests to master should be opened only from integration or a hot-fix feature branch.
69
+
If a change is merged into `master` that is not present in `integration`, then a contributor with push-access to `integration`should rebase `integration` with master to ensure the branches remain in sync and conflict free.
70
70
71
71
## Releasing
72
72
docs-worker-pool contains various triggers for release to higher environments. Currently, the repository supports an integration environment (reflecting the state of the integration branch) and a production environment (reflecting the state of the most recent release tag).
@@ -76,6 +76,7 @@ docs-worker-pool contains various triggers for release to higher environments. C
76
76
- Verify that the deploy-integration-ec2 workflow has executed successfully.
77
77
78
78
### Production
79
-
- Merge outstanding changes within `integration` to `master`.
80
-
- Create release tags.
79
+
- Rebase `master` with `integration` and push the latest changes, or merge a pull request to `master` if performing a hotfix.
80
+
- If you don't have push access, open an issue or otherwise contact a contributor with administrator priveliges.
81
+
- Create release tags. We currently follow [semver](https://semver.org/) standards.
81
82
- Verify that the deploy-production-ec2 workflow executed successfully for both job runs across both production instances.
0 commit comments