From d2b83bc45818dc02a2058b9c7364ac9655de85f6 Mon Sep 17 00:00:00 2001 From: Pat Garrity Date: Sun, 14 Apr 2024 10:16:09 -0500 Subject: [PATCH] Updating workflows again --- .forgejo/workflows/pull_request.yaml | 20 +++++++++--- .forgejo/workflows/release.yaml | 47 +++++++++++++++++++++------- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/.forgejo/workflows/pull_request.yaml b/.forgejo/workflows/pull_request.yaml index 7d6c338..bba274a 100644 --- a/.forgejo/workflows/pull_request.yaml +++ b/.forgejo/workflows/pull_request.yaml @@ -34,13 +34,21 @@ jobs: export GS_RELEASE_TYPE="minor" elif [[ "$latest_commit_message" == *"(patch)"* ]]; then export GS_RELEASE_TYPE="patch" + elif [[ "$latest_commit_message" == *"(docs)"* ]]; then + export GS_RELEASE_TYPE="norelease" + elif [[ "$latest_commit_message" == *"(norelease)"* ]]; then + export GS_RELEASE_TYPE="norelease" else - export GS_RELEASE_TYPE="patch" + export GS_RELEASE_TYPE="norelease" fi echo "GS_RELEASE_TYPE=$GS_RELEASE_TYPE" >> $GITHUB_ENV echo "Previous Git Tag: $latest_git_tag" echo "Latest Commit: $latest_commit_message ($GS_RELEASE_TYPE) (SNAPSHOT)" - sbtn -Dsnapshot=true -Drelease="$GS_RELEASE_TYPE" semVerInfo + if [ "$GS_RELEASE_TYPE" = "norelease" ]; then + sbtn -Dsnapshot=true -Drelease="patch" semVerInfo + else + sbtn -Dsnapshot=true -Drelease="$GS_RELEASE_TYPE" semVerInfo + fi - name: 'Unit Tests and Code Coverage' run: | sbtn clean @@ -50,5 +58,9 @@ jobs: - name: 'Publish Snapshot' run: | echo "Testing env var propagation = ${{ env.GS_RELEASE_TYPE }}" - sbtn clean - sbtn publish + if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then + echo "Skipping publish due to GS_RELEASE_TYPE=norelease" + else + sbtn clean + sbtn publish + fi diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index ecbd203..8351605 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -35,26 +35,49 @@ jobs: export GS_RELEASE_TYPE="minor" elif [[ "$latest_commit_message" == *"(patch)"* ]]; then export GS_RELEASE_TYPE="patch" + elif [[ "$latest_commit_message" == *"(docs)"* ]]; then + export GS_RELEASE_TYPE="norelease" + elif [[ "$latest_commit_message" == *"(norelease)"* ]]; then + export GS_RELEASE_TYPE="norelease" else - export GS_RELEASE_TYPE="patch" + export GS_RELEASE_TYPE="norelease" fi + + echo "GS_RELEASE_TYPE=$GS_RELEASE_TYPE" >> $GITHUB_ENV echo "Previous Git Tag: $latest_git_tag" echo "Latest Commit: $latest_commit_message" echo "Selected Release Type: '$GS_RELEASE_TYPE'" - sbtn -Drelease="$GS_RELEASE_TYPE" semVerInfo + + if [ "$GS_RELEASE_TYPE" = "norelease" ]; then + echo "Skipping all versioning for 'norelease' commit." + else + sbtn -Drelease="$GS_RELEASE_TYPE" semVerInfo + fi - name: 'Unit Tests and Code Coverage' run: | - sbtn clean - sbtn coverage - sbtn test - sbtn coverageReport + if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then + echo "Skipping build/test for 'norelease' commit." + else + sbtn clean + sbtn coverage + sbtn test + sbtn coverageReport + fi - name: 'Publish Release' run: | - sbtn clean - sbtn semVerWriteVersionToFile - sbtn publish + if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then + echo "Skipping publish for 'norelease' commit." + else + sbtn clean + sbtn semVerWriteVersionToFile + sbtn publish + fi - name: 'Create Git Tag' run: | - selected_version="$(cat .version)" - git tag "$selected_version" - git push origin "$selected_version" + if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then + echo "Skipping Git tag for 'norelease' commit." + else + selected_version="$(cat .version)" + git tag "$selected_version" + git push origin "$selected_version" + fi