From 137784dda6bbea5d1f0134bd55b9e5d8c442da4e Mon Sep 17 00:00:00 2001
From: "D. Moonfire" <d.moonfire@moonfire.us>
Date: Tue, 19 Jul 2022 18:58:05 -0500
Subject: [PATCH] fix(woodpecker): tweaking release process

---
 .woodpecker/push.yml => .woodpecker.yml | 27 ++++++++++++++++++++++---
 .woodpecker/tag.yml                     | 27 -------------------------
 2 files changed, 24 insertions(+), 30 deletions(-)
 rename .woodpecker/push.yml => .woodpecker.yml (51%)
 delete mode 100644 .woodpecker/tag.yml

diff --git a/.woodpecker/push.yml b/.woodpecker.yml
similarity index 51%
rename from .woodpecker/push.yml
rename to .woodpecker.yml
index e33888c..7957201 100644
--- a/.woodpecker/push.yml
+++ b/.woodpecker.yml
@@ -9,18 +9,39 @@ pipeline:
         image: registry.gitlab.com/dmoonfire/nix-flake-docker:latest
         commands:
             - nix develop --command scripts/build.sh
+        when:
+            event: [push, pull_request, tag]
+            tag: v*
+
+    test:
+        image: registry.gitlab.com/dmoonfire/nix-flake-docker:latest
+        commands:
             - nix develop --command scripts/test.sh
         when:
             event: [push, pull_request]
-    release:
+
+    release-main:
         image: registry.gitlab.com/dmoonfire/nix-flake-docker:latest
         commands:
             - export DRONE="true" # Required to convince `env-ci` that it is a known CI
-            - git branch $DRONE_BRANCH origin/$DRONE_BRANCH # semantic-release needs this locally
+            - git branch $$CI_COMMIT_SOURCE_BRANCH origin/$$CI_COMMIT_SOURCE_BRANCH # semantic-release needs this locally
             - nix develop --command scripts/release.sh
         secrets:
             - gitea_token
             - git_credentials
         when:
-            event: [push]
+            event: push
             branch: main
+
+    release-gitea:
+        image: plugins/gitea-release
+        settings:
+            base_url: https://src.mfgames.com
+            files:
+                - "*.pdf"
+                - "*.epub"
+            api_key:
+                from_secret: gitea_token
+        when:
+            event: tag
+            tag: v*
diff --git a/.woodpecker/tag.yml b/.woodpecker/tag.yml
deleted file mode 100644
index 46641a9..0000000
--- a/.woodpecker/tag.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-clone:
-    git:
-        image: woodpeckerci/plugin-git
-        settings:
-            tags: true
-
-pipeline:
-    build:
-        image: registry.gitlab.com/dmoonfire/nix-flake-docker:latest
-        commands:
-            - nix develop --command scripts/build.sh
-        when:
-            event: [tag]
-            tag: v*
-    gitea:
-        image: plugins/gitea-release
-        settings:
-            base_url: https://src.mfgames.com
-            files:
-                - "*.pdf"
-                - "*.epub"
-        secrets:
-            - source: gitea_token
-              target: plugin_api_key
-        when:
-            event: [tag]
-            tag: v*