ci: Fixed release process

BottlecapDave · Dec 22, 2021 · 84b8754 · 84b8754
1 parent 3af07d8
commit 84b8754
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git 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
diff --git 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
@@ -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
-```
+## Releases
+
+To release a new version, merge into `main`. The github CI will then create a release based on the commitizen messages.