From 1e40b32ebf3ddec6aac755e2fc1ef6b096b01349 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 25 Jul 2022 15:01:13 +0530
Subject: [PATCH] ci: Combine actions to be triggered 'on release'

* Trigger static asset building & updating release assets
* Trigger Docker release build
---
 .github/workflows/docker-release.yml          | 20 -------------------
 ...ish-assets-releases.yml => on_release.yml} | 20 +++++++++++++++++--
 2 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 .github/workflows/docker-release.yml
 rename .github/workflows/{publish-assets-releases.yml => on_release.yml} (71%)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
deleted file mode 100644
index 988c2dcc6c..0000000000
--- a/.github/workflows/docker-release.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: 'Trigger Docker build on release'
-on:
-  release:
-    types: [released]
-permissions:
-  contents: read
-
-jobs:
-  curl:
-    permissions:
-      contents: none
-    name: 'Trigger Docker build on release'
-    runs-on: ubuntu-latest
-    container:
-      image: alpine:latest
-    steps:
-    - name: curl
-      run: |
-        apk add curl bash
-        curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/frappe/frappe_docker/actions/workflows/build_stable.yml/dispatches -d '{"ref":"main"}'
diff --git a/.github/workflows/publish-assets-releases.yml b/.github/workflows/on_release.yml
similarity index 71%
rename from .github/workflows/publish-assets-releases.yml
rename to .github/workflows/on_release.yml
index ff1656e55d..59e14a8c4d 100644
--- a/.github/workflows/publish-assets-releases.yml
+++ b/.github/workflows/on_release.yml
@@ -1,8 +1,11 @@
-name: 'Frappe Assets'
+name: 'Release'
 
 on:
   release:
-    types: [ created ]
+    types: [released]
+
+permissions:
+  contents: read
 
 env:
   GITHUB_TOKEN: ${{ github.token }}
@@ -47,3 +50,16 @@ jobs:
           asset_path: build/assets.tar.gz
           asset_name: assets.tar.gz
           asset_content_type: application/octet-stream
+
+  docker-release:
+    name: 'Trigger Docker build on release'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: none
+    container:
+      image: alpine:latest
+    steps:
+    - name: curl
+      run: |
+        apk add curl bash
+        curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/frappe/frappe_docker/actions/workflows/build_stable.yml/dispatches -d '{"ref":"main"}'