From 7211101c528dfaf483d1dc826f836a98008a4c9b Mon Sep 17 00:00:00 2001
From: Francis Lavoie <lavofr@gmail.com>
Date: Mon, 8 Jun 2020 14:21:20 -0400
Subject: ci: Fix gemfury upload condition, move triggers to publish event
 (#3483)

---
 .github/workflows/release.yml           | 20 +------------------
 .github/workflows/release_published.yml | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/release_published.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f947472..081bcfa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,7 +73,7 @@ jobs:
 
     # Only publish on non-special tags (e.g. non-beta)
     - name: Publish .deb to Gemfury
-      if: ${{ steps.vars.outputs.tag_special }} == ""
+      if: ${{ steps.vars.outputs.tag_special == "" }}
       env:
         GEMFURY_PUSH_TOKEN: ${{ secrets.GEMFURY_PUSH_TOKEN }}
       run: |
@@ -81,21 +81,3 @@ jobs:
           curl -F package=@"$filename" https://${GEMFURY_PUSH_TOKEN}:@push.fury.io/caddy/
         done
 
-    # See https://github.com/peter-evans/repository-dispatch
-    - name: Trigger event on caddyserver/dist
-      uses: peter-evans/repository-dispatch@v1
-      with:
-        token: ${{ secrets.REPO_DISPATCH_TOKEN }}
-        repository: caddyserver/dist
-        event-type: release-tagged
-        client-payload: '{"tag": "${{ steps.vars.outputs.version_tag }}"}'
-
-    - name: Trigger event on caddyserver/caddy-docker
-      uses: peter-evans/repository-dispatch@v1
-      with:
-        token: ${{ secrets.REPO_DISPATCH_TOKEN }}
-        repository: caddyserver/caddy-docker
-        event-type: release-tagged
-        client-payload: '{"tag": "${{ steps.vars.outputs.version_tag }}"}'
-
-
diff --git a/.github/workflows/release_published.yml b/.github/workflows/release_published.yml
new file mode 100644
index 0000000..cf47e73
--- /dev/null
+++ b/.github/workflows/release_published.yml
@@ -0,0 +1,34 @@
+name: Release Published
+
+# Event payload: https://developer.github.com/webhooks/event-payloads/#release
+on:
+  release:
+    types: [published]
+
+jobs:
+  release:
+    name: Release Published
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    # See https://github.com/peter-evans/repository-dispatch
+    - name: Trigger event on caddyserver/dist
+      uses: peter-evans/repository-dispatch@v1
+      with:
+        token: ${{ secrets.REPO_DISPATCH_TOKEN }}
+        repository: caddyserver/dist
+        event-type: release-tagged
+        client-payload: '{"tag": "${{ github.release.tag_name }}"}'
+
+    - name: Trigger event on caddyserver/caddy-docker
+      uses: peter-evans/repository-dispatch@v1
+      with:
+        token: ${{ secrets.REPO_DISPATCH_TOKEN }}
+        repository: caddyserver/caddy-docker
+        event-type: release-tagged
+        client-payload: '{"tag": "${{ github.release.tag_name }}"}'
+
-- 
cgit v1.2.3