From f68d01d50f5fbfc0e1fd0eba9c97a5d7952ef4ef Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 5 Apr 2025 21:26:05 +0000 Subject: [PATCH 1/2] Workflow changes (#9) Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/9 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/tag_release.yml b/.gitea/workflows/tag_release.yml index d96250e..f5aa18c 100644 --- a/.gitea/workflows/tag_release.yml +++ b/.gitea/workflows/tag_release.yml @@ -3,7 +3,6 @@ name: Release Tagging on: push: branches: - - main - devel tags: - 'v*' # Trigger on tags matching v* @@ -20,7 +19,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.85.0 + toolchain: 1.86.0 components: cargo - name: Extract Version from Cargo.toml @@ -43,6 +42,12 @@ jobs: echo "Printing version" echo "Version: ${{ steps.version.outputs.project_tag_release }}" + - name: Check Branch + if: github.ref != 'refs/heads/devel' || github.ref != 'refs/heads/devel' # Replace 'main' with your required branch + run: | + echo "::error::Release can only be created from the 'main' branch." + exit 1 + - name: Create GitHub Release uses: actions/create-release@v1 env: -- 2.43.0 From 8bc49e781b1041dc7c5c5a4affb8690e7488d524 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 5 Apr 2025 22:00:41 +0000 Subject: [PATCH 2/2] Correcting action workflow (#12) Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/12 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitea/workflows/tag_release.yml b/.gitea/workflows/tag_release.yml index f5aa18c..ace8180 100644 --- a/.gitea/workflows/tag_release.yml +++ b/.gitea/workflows/tag_release.yml @@ -3,9 +3,8 @@ name: Release Tagging on: push: branches: + - main - devel - tags: - - 'v*' # Trigger on tags matching v* jobs: release: @@ -42,12 +41,6 @@ jobs: echo "Printing version" echo "Version: ${{ steps.version.outputs.project_tag_release }}" - - name: Check Branch - if: github.ref != 'refs/heads/devel' || github.ref != 'refs/heads/devel' # Replace 'main' with your required branch - run: | - echo "::error::Release can only be created from the 'main' branch." - exit 1 - - name: Create GitHub Release uses: actions/create-release@v1 env: -- 2.43.0