From 84b87548076ea73e425a9394566bc0c5f438f9f5 Mon Sep 17 00:00:00 2001
From: BottlecapDave <me@davidskendall.co.uk>
Date: Wed, 22 Dec 2021 17:10:45 +0000
Subject: [PATCH] ci: Fixed release process

---
 .releaserc.json |  2 +-
 CHANGELOG.md    | 13 -------------
 package.json    |  2 +-
 readme.md       | 10 ++++------
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/.releaserc.json b/.releaserc.json
index 430d5dc..0a9c49f 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -18,7 +18,7 @@
     ],
     [
       "@semantic-release/git", {
-        "assets": ["package.json", "CHANGELOG.md", "./custom_components/first_bus/manifest.json"],
+        "assets": ["package.json", "CHANGELOG.md"],
         "message": "release: Released v${nextRelease.version} [skip ci]"
       }
     ]
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index f422fb4..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# [1.3.0](https://github.com/BottlecapDave/Gitlab-Merge-Request-Reminder/compare/v1.2.2...v1.3.0) (2021-12-22)
-
-
-### Features
-
-* use non-zero exit code on error ([a5e8680](https://github.com/BottlecapDave/Gitlab-Merge-Request-Reminder/commit/a5e8680e4851fa1650a5a117ca368b507d1c46ac))
-
-# [1.3.0](https://github.com/BottlecapDave/Gitlab-Merge-Request-Reminder/compare/v1.2.2...v1.3.0) (2021-12-22)
-
-
-### Features
-
-* use non-zero exit code on error ([a5e8680](https://github.com/BottlecapDave/Gitlab-Merge-Request-Reminder/commit/a5e8680e4851fa1650a5a117ca368b507d1c46ac))
diff --git a/package.json b/package.json
index 9eba32d..6a622fa 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "commit": "cz",
     "release": "semantic-release",
     "docker-build": "(cd ./reminder && docker build -t bottlecapdave/gitlab-merge-request-reminder:latest .)",
-    "docker-release": "(cd ./reminder && docker push bottlecapdave/gitlab-merge-request-reminder:latest) && (cd ./reminder && docker push bottlecapdave/gitlab-merge-request-reminder:$TAG)"
+    "docker-release": "(cd ./reminder && docker tag bottlecapdave/gitlab-merge-request-reminder:latest bottlecapdave/gitlab-merge-request-reminder:$TAG && docker push bottlecapdave/gitlab-merge-request-reminder:latest && docker push bottlecapdave/gitlab-merge-request-reminder:$TAG)"
   },
   "repository": {
     "type": "git",
diff --git a/readme.md b/readme.md
index 4dd0295..758ab26 100644
--- a/readme.md
+++ b/readme.md
@@ -38,10 +38,8 @@ merge-request-reminder:
 
 ## Build
 
-Tag the commit in the form of `v{MAJOR}.{Minor}.{Bugfix}` and then run `npm run build-docker`
+You can run `npm run docker-build` to build a local docker image, which can then be run locally.
 
-e.g.
-```
-git tag v1.0.0
-npm run docker-build
-```
\ No newline at end of file
+## Releases
+
+To release a new version, merge into `main`. The github CI will then create a release based on the commitizen messages.
\ No newline at end of file