From aef00a63cf8168f77221261300cae415dde4f968 Mon Sep 17 00:00:00 2001 From: Simon Diesenreiter Date: Mon, 2 Dec 2024 06:41:12 +0100 Subject: [PATCH] ci: bugfixes with workflows, ref: NOISSUE --- .gitea/rename_project.sh | 2 ++ .gitea/workflows/main.yml | 3 +++ .gitea/workflows/release.yml | 3 +++ Makefile | 12 ++---------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitea/rename_project.sh b/.gitea/rename_project.sh index 022fc64..66cb172 100755 --- a/.gitea/rename_project.sh +++ b/.gitea/rename_project.sh @@ -38,3 +38,5 @@ mv $name.Tests/project_name.Tests.csproj $name.Tests/$name.Tests.csproj # This command runs only once on GHA! rm -rf .gitea/template.yml +rm -rf project_name +rm -rf project_name.Tests diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index bffb70d..338c29c 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -2,6 +2,9 @@ name: CI +env: + SKIP_MAKE_SETUP_CHECK: 'true' + # Controls when the workflow will run on: # Triggers the workflow on push or pull request events but only for the main branch diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 89c423e..5d34921 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -2,6 +2,9 @@ name: Upload Python Package permissions: contents: write +env: + SKIP_MAKE_SETUP_CHECK: 'true' + on: push: # Sequence of patterns matched against refs/tags diff --git a/Makefile b/Makefile index ceb6b7c..29686cc 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ .PHONY: issetup issetup: - @[ -f .git/hooks/commit-msg ] || (echo "You must run 'make setup' first to initialize the repo!" && exit 1) + @[ -f .git/hooks/commit-msg ] || [ -v SKIP_MAKE_SETUP_CHECK ] || (echo "You must run 'make setup' first to initialize the repo!" && exit 1) .PHONY: setup setup: @@ -45,15 +45,7 @@ clean: issetup ## Clean unused files. .PHONY: release release: issetup ## Create a new tag for release. - @echo "WARNING: This operation will create a version tag and push to gitea" - @read -p "Version? (provide the next x.y.z semver) : " TAG; echo "$$TAG" > project_name/VERSION - @gitchangelog > HISTORY.md - @git add project_name/VERSION HISTORY.md - @git commit -m "release: version $$(cat project_name/VERSION) 🚀" - @echo "creating git tag : $$(cat project_name/VERSION)" - @git tag $$(cat project_name/VERSION) - @git push -u origin HEAD --tags - @echo "Gitea Actions will detect the new tag and release the new version." + @./.gitea/conventional_commits/generate-version.sh .PHONY: docs docs: issetup ## Build the documentation.