From 6e16b286a5fcd1e3722363cc53804950f0f9bf0f Mon Sep 17 00:00:00 2001 From: JRSmiffy Date: Sat, 21 Oct 2023 14:15:31 +0100 Subject: [PATCH 1/4] documentation update --- CHANGELOG.md | 8 +++++++- DOCUMENTATION.md | 9 ++++++++- version/version.py | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e4f0a4..3f58f1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 # Releases +## [0.1.0] - 21/10/2023 + +### Tickets +- UMA-4: ... + ## [0.0.0] - 21/10/2023 ### Tickets @@ -25,4 +30,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-[0.0.0]: https://github.com/JRSmiffy/ultima/releases/tag/0.0.0 \ No newline at end of file +[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 \ No newline at end of file diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index f81b6c2..e653fe8 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -13,4 +13,11 @@ ## Costs * Domain: £4 for one year -* Hosting: [render.com](https://render.com/) free plan \ No newline at end of file +* 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 \ No newline at end of file diff --git a/version/version.py b/version/version.py index a46adb8..8989a88 100644 --- a/version/version.py +++ b/version/version.py @@ -1 +1 @@ -__version__ = "0.0.1-SNAPSHOT" \ No newline at end of file +__version__ = "0.1.0-SNAPSHOT" \ No newline at end of file From 1a85cb5a2da95be9bfb9642c300f15d352db4074 Mon Sep 17 00:00:00 2001 From: JRSmiffy Date: Sat, 21 Oct 2023 14:38:14 +0100 Subject: [PATCH 2/4] changelog update --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f58f1f..c22af0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,13 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.1.0] - 21/10/2023 - -### Tickets - UMA-4: ... ## [0.0.0] - 21/10/2023 - -### Tickets - UMA-2: Create Flask MVP - UMA-3: Deploy to Render (with Redis) - UMA-9: Add project version and create a CHANGELOG From 9f0f6c420f2556c341db586e1b7772c72fbe89c6 Mon Sep 17 00:00:00 2001 From: JRSmiffy Date: Sat, 21 Oct 2023 14:52:26 +0100 Subject: [PATCH 3/4] [patch] UMA-4: slim workflow --- .github/workflows/main.yaml | 2 +- CHANGELOG.md | 9 +++++++-- version/version.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 0165cd2..0d89e6f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,4 +1,4 @@ -name: test-tag-deploy +name: test-n-tag on: push: branches: [ main ] diff --git a/CHANGELOG.md b/CHANGELOG.md index c22af0c..bcca784 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 # Releases +## [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: ... +- UMA-4: Set-up GitHub action to build, test, release and deploy ## [0.0.0] - 21/10/2023 - UMA-2: Create Flask MVP @@ -27,4 +31,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.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 \ No newline at end of file +[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 \ No newline at end of file diff --git a/version/version.py b/version/version.py index 8989a88..fbdcf1b 100644 --- a/version/version.py +++ b/version/version.py @@ -1 +1 @@ -__version__ = "0.1.0-SNAPSHOT" \ No newline at end of file +__version__ = "0.1.1-SNAPSHOT" \ No newline at end of file From 5cb3b01cd58c55d6a4885d27efefa74398a9541a Mon Sep 17 00:00:00 2001 From: jrsmth Date: Sun, 22 Oct 2023 10:34:56 +0100 Subject: [PATCH 4/4] [patch] UMA-5: Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 11de3c2..22a713c 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -ultima.wtf \ No newline at end of file +ultima.jrsmth.io \ No newline at end of file