From 2250d12f3eb4d76a865f67ce36a861933a4942b4 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 21 Dec 2020 10:02:51 +0100
Subject: [PATCH] ci: gh-actions: fix notify

---
 .github/notify-gitter.sh             |  2 +-
 .github/workflows/cmake-build-ci.gen |  4 ++--
 .github/workflows/cmake-build-ci.yml | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/notify-gitter.sh b/.github/notify-gitter.sh
index 0d66504c..edfe9995 100644
--- a/.github/notify-gitter.sh
+++ b/.github/notify-gitter.sh
@@ -10,7 +10,7 @@ BUILD_URL=https://github.com/${REPO}/actions/runs/${GITHUB_RUN_ID}
 BUILD_ENV=${ImageOS}/${CC:-${CC_VND}-${CC_VER}}
 
 case "$2" in
-1|true)
+1|true|success)
 	level=info
 	status=success
 	;;
diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 40c4db2d..1ac55f9e 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -243,8 +243,8 @@ function steps_package() {
 
 function steps_notify($os_vnd) {
 ?>
-      - name: Notify Gitter (success)
-        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ success() }}
+      - name: Notify Gitter
+        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
 <?php
 }
 
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index 13a2f40e..fcb497a5 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -110,8 +110,8 @@ jobs:
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
-      - name: Notify Gitter (success)
-        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ success() }}
+      - name: Notify Gitter
+        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
       - uses: codecov/codecov-action@v1.0.13
 
   # sanitizer build
@@ -188,8 +188,8 @@ jobs:
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
-      - name: Notify Gitter (success)
-        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ success() }}
+      - name: Notify Gitter
+        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
 
   # mac debug
   dbg-mac:
@@ -259,8 +259,8 @@ jobs:
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
-      - name: Notify Gitter (success)
-        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ success() }}
+      - name: Notify Gitter
+        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
       - uses: codecov/codecov-action@v1.0.13
 
   # mac release
@@ -330,8 +330,8 @@ jobs:
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
-      - name: Notify Gitter (success)
-        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ success() }}
+      - name: Notify Gitter
+        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
 
   # windows release builds
   windows:
@@ -393,8 +393,8 @@ jobs:
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
-      - name: Notify Gitter (success)
-        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ success() }}
+      - name: Notify Gitter
+        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
 
   # linux release builds
   release:
@@ -536,5 +536,5 @@ jobs:
           cmake -DCPACK_COMPONENT_INSTALL=ON build
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
           cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
-      - name: Notify Gitter (success)
-        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ success() }}
+      - name: Notify Gitter
+        run: bash .github/notify-gitter.sh ${{ secrets.GITTER }} ${{ job.status }}
-- 
2.30.2