From 9cb9ab3a76b71da36118096e3fc24e2a4b63b24b Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 26 Dec 2020 13:46:00 +0100 Subject: [PATCH] Update setup-variables.sh --- github-workflows/setup-variables.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/github-workflows/setup-variables.sh b/github-workflows/setup-variables.sh index d194bc4..c3bfd40 100644 --- a/github-workflows/setup-variables.sh +++ b/github-workflows/setup-variables.sh @@ -11,8 +11,8 @@ 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))?$/\2\3\4/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))?$/\2\3\4/g') if [[ -z "GH_OS_NAME" ]]; then export GH_OS_NAME=$(echo $GH_MATRIX_OS | sed -$PCRE 's/^([^-]+)/\1/g')