From 54fd07a9bc99c938be0c040cdb6fe1d8ccfe7f51 Mon Sep 17 00:00:00 2001 From: Ting-Gian LUA Date: Sat, 30 Nov 2024 16:05:15 +0800 Subject: [PATCH] [ ci ] Grep only the digits from the GHC version --- .github/workflows/test-linux.yaml | 2 +- .github/workflows/test-mac.yaml | 2 +- .github/workflows/test-windows.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-linux.yaml b/.github/workflows/test-linux.yaml index e581eb1..21bec3e 100644 --- a/.github/workflows/test-linux.yaml +++ b/.github/workflows/test-linux.yaml @@ -21,7 +21,7 @@ jobs: - name: 🔍 Determine stack resolver & GHC run: | STACK_RESOLVER=$(yq .resolver stack.yaml) - GHC_VERSION=$(yq .compiler stack.yaml) + GHC_VERSION=$(echo $(yq .compiler stack.yaml) | grep -oP '\d+\.\d+\.\d+') echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}" echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}" diff --git a/.github/workflows/test-mac.yaml b/.github/workflows/test-mac.yaml index 93d8c1c..07b47f8 100644 --- a/.github/workflows/test-mac.yaml +++ b/.github/workflows/test-mac.yaml @@ -21,7 +21,7 @@ jobs: - name: 🔍 Determine stack resolver & GHC run: | STACK_RESOLVER=$(yq .resolver stack.yaml) - GHC_VERSION=$(yq .compiler stack.yaml) + GHC_VERSION=$(echo $(yq .compiler stack.yaml) | grep -oP '\d+\.\d+\.\d+') echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}" echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}" diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index 6fd8a26..ccbf697 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -4,7 +4,7 @@ name: CI (Windows) on: push: - branches: [master, ci-*] + branches: [master, ci-*, ci] tags: - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 pull_request: @@ -33,7 +33,7 @@ jobs: run: | STACK_ROOT="C:/Users/runneradmin/AppData/Local/Programs/stack/x86_64-windows" STACK_RESOLVER=$(yq .resolver stack.yaml) - GHC_VERSION=$(yq .compiler stack.yaml) + GHC_VERSION=$(echo $(yq .compiler stack.yaml) | grep -oP '\d+\.\d+\.\d+') echo STACK_ROOT="${STACK_ROOT}" >> "${GITHUB_ENV}" echo STACK_RESOLVER="${STACK_RESOLVER}" >> "${GITHUB_ENV}" echo GHC_VERSION="${GHC_VERSION}" >> "${GITHUB_ENV}"