From 7b707fb4abe2c3ba1eb1e0eb5478894602ae340c Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sat, 26 Dec 2020 13:07:23 +0100
Subject: [PATCH] Update build.yaml and setup-variables.sh

---
 .github/workflows/build.yaml        |  1 +
 github-workflows/setup-variables.sh | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 543ef38..605c5cd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -52,6 +52,7 @@ jobs:
         run: |
           # ====== Variables
           export REVISION=${{ github.run_number }}
+          export GH_MATRIX_OS=${{ matrix.os }}
           export GH_MATRIX_ARCH=${{ matrix.arch }}
 
           echo "$(realpath .)"
diff --git a/github-workflows/setup-variables.sh b/github-workflows/setup-variables.sh
index 46c2281..0c429ff 100644
--- a/github-workflows/setup-variables.sh
+++ b/github-workflows/setup-variables.sh
@@ -2,16 +2,21 @@
 set -e
 export MAVEN_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED"
 
-echo "$GH_MATRIX_ARCH"
+echo "MATRIX_OS: $GH_MATRIX_OS"
+echo "MATRIX_ARCH: $GH_MATRIX_ARCH"
 
-if [ "$GH_MATRIX_ARCH" == "macos/amd64" ]; then
+if [ "MATRIX_OS" == "macos-10.15" ]; then
 	export PCRE="E"
 else
 	export PCRE="r"
 fi
 
-export GH_CPU_ARCH=$(echo $GH_MATRIX_ARCH | sed -$PCRE 's/^(linux|windows|macos)\/(386|amd64|arm64|ppc64le|arm)(\/(v6|v7))?$/\2\4/g')
-export GH_OS_NAME=$(echo $GH_MATRIX_ARCH | sed -$PCRE 's/^(linux|windows|macos)\/(386|amd64|arm64|ppc64le|arm)(\/(v6|v7))?$/\1/g')
+export GH_CPU_ARCH=$(echo $GH_MATRIX_ARCH | sed -$PCRE 's/^(linux\/|windows\/|macos\/|)(386|amd64|arm64|ppc64le|arm)(\/(v6|v7))?$/\2\4/g')
+export GH_OS_NAME=$(echo $GH_MATRIX_ARCH | sed -$PCRE 's/^(linux\/|windows\/|macos\/|)(386|amd64|arm64|ppc64le|arm)(\/(v6|v7))?$/\1/g')
+
+if [[ -z "GH_OS_NAME" ]]; then
+	export GH_OS_NAME=$(echo $GH_MATRIX_OS | sed -$PCRE 's/^([^-]+)/\1/g')
+fi
 
 if [[ "$GH_CPU_ARCH" == "arm64" ]]; then
 	export CPU_ARCHITECTURE_NAME="aarch64"