Skip to content

Commit

Permalink
Merge pull request #2 from jrsmth/feature/workflow/main
Browse files Browse the repository at this point in the history
Feature/workflow/main
  • Loading branch information
jrsmth authored Oct 22, 2023
2 parents 9221993 + 66ce59d commit 453e5e6
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: test-tag-deploy
name: test-n-tag
on:
push:
branches: [ main ]
Expand Down
13 changes: 10 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
# Releases
<!-- @LatestFirst -->

## [0.0.0] - 21/10/2023
## [0.1.1] - 21/10/2023
- UMA-4: Set-up GitHub action to build, test, release and deploy
- UMA-5: Acquire domain name and set-up on repo/platform

## [0.1.0] - 21/10/2023
- UMA-4: Set-up GitHub action to build, test, release and deploy

### Tickets
## [0.0.0] - 21/10/2023
- UMA-2: Create Flask MVP
- UMA-3: Deploy to Render (with Redis)
- UMA-9: Add project version and create a CHANGELOG

<br>

[0.0.0]: https://github.com/JRSmiffy/ultima/releases/tag/0.0.0
[0.0.0]: https://github.com/JRSmiffy/ultima/releases/tag/0.0.0
[0.1.0]: https://github.com/JRSmiffy/ultima/releases/tag/0.0.0...0.1.0
[0.1.1]: https://github.com/JRSmiffy/ultima/releases/tag/0.1.0...0.1.1
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ultima.wtf
ultima.jrsmth.io
9 changes: 8 additions & 1 deletion DOCUMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,11 @@

## Costs
* Domain: £4 for one year
* Hosting: [render.com](https://render.com/) free plan
* Hosting: [render.com](https://render.com/) free plan

## Developer
* Branching Strategy `//TODO`
* Group tickets by feature (major/minor release, i.e `0.1.x` for 'Workflow')
* `git checkout -b feature/workflow/main`
* `git checkout -b feature/workflow/UMA-4` -> merge back into `feature/workflow/main`
* Merge into `main` when you're ready to release that feature

0 comments on commit 453e5e6

Please sign in to comment.