From 36d27ea1d3900b376c84dc9950b08150c0580116 Mon Sep 17 00:00:00 2001 From: weizhoublue Date: Wed, 25 Dec 2024 19:55:45 +0800 Subject: [PATCH] github Signed-off-by: weizhoublue --- .github/workflows/update-golang.yaml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-golang.yaml b/.github/workflows/update-golang.yaml index 867e07e5..b40cec1f 100644 --- a/.github/workflows/update-golang.yaml +++ b/.github/workflows/update-golang.yaml @@ -10,7 +10,7 @@ on: jobs: update: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index 08e9c33f..46aa60e0 100644 --- a/Makefile +++ b/Makefile @@ -107,8 +107,8 @@ update_workflow_golang: # Update Go version in go.mod .PHONY: update_mod_golang update_mod_golang: - GO_MAJOR_AND_MINOR_VERSION=` grep -o -E '^[0-9]+\.[0-9]+' <<< "$(GO_VERSION)" ` - GO_MAJOR_AND_MINOR_VERSION=` grep -o -E '^[0-9]+\.[0-9]+' <<< "$(GO_VERSION)" ` ; \ + GO_MAJOR_AND_MINOR_VERSION=` echo $(GO_VERSION) | grep -o -E '^[0-9]+\.[0-9]+' ` + GO_MAJOR_AND_MINOR_VERSION=` echo $(GO_VERSION) | grep -o -E '^[0-9]+\.[0-9]+' ` ; \ echo "update go.mod to $${GO_MAJOR_AND_MINOR_VERSION}" ; \ sed -i -E 's/^go .*/go '"$${GO_MAJOR_AND_MINOR_VERSION}"'/g' go.mod