From 9778fa86108eb243724d6bef194150fcf9f06ad2 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 24 Jul 2024 00:45:16 +0200 Subject: [PATCH] .github/workflows/devbuild.yaml: fix version string bash stuff :) --- .github/workflows/devbuild.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/devbuild.yaml b/.github/workflows/devbuild.yaml index 6a04233..b8897d0 100644 --- a/.github/workflows/devbuild.yaml +++ b/.github/workflows/devbuild.yaml @@ -24,8 +24,8 @@ jobs: - name: compile id: compile run: | - VER=$(cat Makefile | grep 'PROGRAM_VERSION=' | sed 's/PROGRAM_VERSION=//g') - GOOS=${{matrix.os}} GOARCH=${{matrix.arch}} PROGRAM_VERSION="${VER}-${GITHUB_SHA}" make build tools + VER=$(cat Makefile | sed -n 's/^PROGRAM_VERSION\s*\(\?\)\s*=\s*//p') + GOOS=${{matrix.os}} GOARCH=${{matrix.arch}} PROGRAM_VERSION="${VER}-$(echo $GITHUB_SHA | cut -b -8)" make build tools - name: Upload thalos-server uses: actions/upload-artifact@v4 @@ -60,8 +60,8 @@ jobs: - name: compile id: compile run: | - VER=$(cat Makefile | grep 'PROGRAM_VERSION=' | sed 's/PROGRAM_VERSION=//g') - GOOS=${{matrix.os}} GOARCH=${{matrix.arch}} PROGRAM_VERSION="${VER}-${GITHUB_SHA}" make build tools + VER=$(cat Makefile | sed -n 's/^PROGRAM_VERSION\s*\(\?\)\s*=\s*//p') + GOOS=${{matrix.os}} GOARCH=${{matrix.arch}} PROGRAM_VERSION="${VER}-$(echo $GITHUB_SHA | cut -b -8)" make build tools - name: Upload thalos-server uses: actions/upload-artifact@v4