unified changelog and release system

no10ds · Jul 5, 2023 · e6c0fed · e6c0fed
1 parent 96a1d30
commit e6c0fed
Show file tree

Hide file tree

Showing 28 changed files with 74 additions and 1,024 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Number 10 Downing Street
+Copyright (c) 2022 Number 10 Downing Street
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -172,3 +172,11 @@ ui-zip-and-release:		## Zip and release prod static ui site
 	@cd ui/; $(MAKE) zip-contents tag=${tag}; $(MAKE) upload-to-release-prod tag=${tag}
 
 ##
+release:
+	@git checkout ${commit}
+	@git tag -a "${version}" -m "Release tag for version ${version}"
+	@git checkout -
+	@git push origin ${version}
+	@python get_latest_release_changelog.py
+	@gh release create ${version} -F latest_release_changelog.md
+	@rm -rf latest_release_changelog.md
diff --git a/api/SECURITY.md → SECURITY.md b/api/SECURITY.md → SECURITY.md
diff --git a/api/LICENSE b/api/LICENSE
diff --git a/api/Makefile b/api/Makefile
@@ -31,16 +31,6 @@ check-app-is-running:
 	@aws ecs wait services-stable --region $(AWS_REGION) --services $(ECS_SERVICE) --cluster $(ECS_CLUSTER)
 	@echo "finished waiting for services to be stable"
 
-# Release -------------------------
-release:
-	@git checkout ${commit}
-	@git tag -a "${version}" -m "Release tag for version ${version}"
-	@git checkout -
-	@git push origin ${version}
-	@./batect generate_latest_changelog
-	@gh release create ${version} -F latest_release_changelog.md
-	@rm -rf latest_release_changelog.md
-
 tag-release-image:			## Tag the image with the tag name
 	@docker tag rapid-api-service-image:latest $(PUBLIC_URI)/$(PUBLIC_IMAGE):${GITHUB_REF_NAME}
 

diff --git a/api/changelog.md b/api/changelog.md
diff --git a/api/changelog_release_template.md b/api/changelog_release_template.md