Skip to content

Commit 4f7f709

Browse files
wusamzongwilfred-s
wusamzong
authored andcommittedDec 1, 2022
[YUNIKORN-1430] change go version check in Makefile (apache#457)
Closes: apache#457 Signed-off-by: Wilfred Spiegelenburg <wilfreds@apache.org>
1 parent 50cd0c7 commit 4f7f709

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
uses: actions/checkout@v3
1818
with:
1919
fetch-depth: 2
20-
- name: Check license
21-
run: make license-check
22-
if: ${{ github.event_name == 'pull_request' }}
2320
- name: Set up Go
2421
uses: actions/setup-go@v3
2522
with:
2623
go-version-file: .go_version
24+
- name: Check license
25+
run: make license-check
26+
if: ${{ github.event_name == 'pull_request' }}
2727
- name: Go lint
2828
run: make lint
2929
if: ${{ github.event_name == 'pull_request' }}

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Check if this GO tools version used is at least the version of go specified in
1919
# the go.mod file. The version in go.mod should be in sync with other repos.
2020
GO_VERSION := $(shell go version | awk '{print substr($$3, 3, 10)}')
21-
MOD_VERSION := $(shell awk '/^go/ {print $$2}' go.mod)
21+
MOD_VERSION := $(shell cat .go_version)
2222

2323
GM := $(word 1,$(subst ., ,$(GO_VERSION)))
2424
MM := $(word 1,$(subst ., ,$(MOD_VERSION)))

0 commit comments

Comments
 (0)
Please sign in to comment.