From 73f50b9f3710b7897e1f4c5ee738b3958100a7fe Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 21 Dec 2020 23:14:13 +0100
Subject: [PATCH] ci: sr.ht: fix gitter notify

---
 .builds/alpine.yml            | 4 ++--
 .builds/freebsd.yml           | 4 ++--
 .builds/openbsd.yml           | 4 ++--
 .builds/scripts/maybe         | 5 -----
 .builds/scripts/notify-gitter | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index c8cda83f..0ee825b1 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -12,7 +12,7 @@ sources:
   - https://github.com/m6w6/libmemcached
 secrets:
   - 685c5b0a-395c-4031-97f8-97496bb6c25f
-  - 79d59693-c250-4eba-9569-24650f86256b
+  - d7dfe587-b433-481b-8725-d7ccd82e59fb
 environment:
   ENABLE_HASH_HSIEH:  "ON"
   ENABLE_MEMASLAP:    "ON"
@@ -29,4 +29,4 @@ tasks:
   - install: |
       maybe cmake --install debug --prefix /tmp
   - success: |
-      maybe
+      notify-gitter success
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 646a04e4..e9add60b 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -16,7 +16,7 @@ sources:
   - https://github.com/m6w6/libmemcached
 secrets:
   - 685c5b0a-395c-4031-97f8-97496bb6c25f
-  - 79d59693-c250-4eba-9569-24650f86256b
+  - d7dfe587-b433-481b-8725-d7ccd82e59fb
 environment:
   ENABLE_HASH_HSIEH:  "ON"
   ENABLE_MEMASLAP:    "ON"
@@ -52,4 +52,4 @@ tasks:
       maybe cmake --build release -j2 --target package -- VERBOSE=
       maybe cmake --build release -j2 --target push-artifacts -- VERBOSE=
   - success: |
-      maybe
+      notify-gitter success
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 859eda82..e437f625 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -16,7 +16,7 @@ sources:
   - https://github.com/m6w6/libmemcached
 secrets:
   - 685c5b0a-395c-4031-97f8-97496bb6c25f
-  - 79d59693-c250-4eba-9569-24650f86256b
+  - d7dfe587-b433-481b-8725-d7ccd82e59fb
 environment:
   ENABLE_HASH_HSIEH:  "ON"
   ENABLE_MEMASLAP:    "OFF"
@@ -40,4 +40,4 @@ tasks:
       maybe cmake --build release -j2 --target package -- VERBOSE=
       maybe cmake --build release -j2 --target push-artifacts -- VERBOSE=
   - success:
-      maybe
+      notify-gitter success
diff --git a/.builds/scripts/maybe b/.builds/scripts/maybe
index 0a5b6616..8ac824db 100755
--- a/.builds/scripts/maybe
+++ b/.builds/scripts/maybe
@@ -1,9 +1,4 @@
 #!/usr/bin/env bash
-if test $# -eq 0
-then
-	notify-gitter success
-fi
-
 "$@"
 ERROR=$?
 
diff --git a/.builds/scripts/notify-gitter b/.builds/scripts/notify-gitter
index c5f1f2bd..7be63d08 100755
--- a/.builds/scripts/notify-gitter
+++ b/.builds/scripts/notify-gitter
@@ -9,7 +9,7 @@ REF=$(GIT_DIR=libmemcached/.git git describe --abbrev --always)
 REF_URL=https://github.com/${REPO}/commits/${REF}
 
 BUILD_URL=${JOB_URL}
-BUILD_TAG=$(uname -o)
+BUILD_TAG=$(uname -o 2>/dev/null || uname -s)
 if test "$BUILD_TAG" = "GNU/Linux"
 then
 	BUILD_TAG=$(lsb_release -irs)
-- 
2.30.2