Skip to content

Commit

Permalink
DF-838:Added workflow for etna-rosetta (#1489)
Browse files Browse the repository at this point in the history
  • Loading branch information
TNA-Allan authored Dec 21, 2023
1 parent 9471a2d commit 467b324
Showing 1 changed file with 33 additions and 0 deletions.
33 changes: 33 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,39 @@ Create a super user:
dj createsuperuser
```

## ETNA-ROSETTA WORKFLOW

### entna-rosetta Branch, Environment:
- etna-rosetta is branched off `ds-wagtail:develop`
- is a long running branch which contains changes made for ROSETTA API (develop contains changes for KONG API)
- it is also an environment which is branched off develop
- it will be merged into develop when KONG API is decommissioned to use, or for some other reason.
- brings in new changes from develop
- adds any specific changes for Rosetta
- a CD will initiate to deploy to `etna-rosetta` for any merges into `etna-rosetta`


### Syncing entna-rosetta with channges from develop

Option 1
- create a branch off `etna-rosetta` eg: chore/sync-ddmmyyy
- merge develop branch into chore/sync-ddmmyyy
- fix conflicts
- create PR into `etna-rosetta`

Option 2
- merge develop into `etna-rosetta`
- fix conflicts


### Feature changes/fixes for entna-rosetta

- create feature,fix ticket branches off `etna-rosetta`
- merge latest changes from `etna-rosetta` into the feature branch
- create PR into `etna-rosetta`
- test feature in a spare environment if available


## Issues with your local environment?

Check out the [Local development gotchas](https://nationalarchives.github.io/ds-wagtail/developer-guide/local-development-gotchas/) page for solutions to common issues.
Expand Down

0 comments on commit 467b324

Please sign in to comment.