Skip to content

Commit b6d79b8

Browse files
lzf575SongZhen0704
authored andcommitted
chore: update go to 1.24
1 parent 9a15b69 commit b6d79b8

File tree

2 files changed

+55
-21
lines changed

2 files changed

+55
-21
lines changed

.github/workflows/cli-build.yml

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: build cli
22

3-
on:
3+
on:
44
push:
55
branches:
66
- main
@@ -15,7 +15,7 @@ on:
1515
inputs:
1616
ref:
1717
description: "Why trigger?"
18-
required: true
18+
required: true
1919
type: string
2020

2121
jobs:
@@ -32,27 +32,44 @@ jobs:
3232
- name: Set up Go
3333
uses: actions/setup-go@master
3434
with:
35-
go-version: 1.21.x
35+
go-version: 1.24.x
36+
37+
- name: Set up GOPATH env
38+
run: echo "GOPATH=$(go env GOPATH)" >> "$GITHUB_ENV"
3639

3740
- name: Install Protoc
3841
uses: arduino/setup-protoc@v1
3942
with:
4043
version: '3.6.1'
4144
repo-token: ${{ secrets.GITHUB_TOKEN }}
4245

46+
- name: Checkout github.com/gogo/protobuf
47+
uses: actions/checkout@v3
48+
with:
49+
repository: 'gogo/protobuf'
50+
path: "protobuf"
51+
ref: 'v1.3.2'
52+
fetch-depth: 1
53+
54+
- name: Move github.com/gogo/protobuf to $GOPATH/src
55+
run: |
56+
mkdir -p "${{ env.GOPATH }}/src/github.com/gogo"
57+
mv protobuf "${{ env.GOPATH }}/src/github.com/gogo/protobuf"
58+
4359
- name: build cli
4460
run: |
4561
sudo apt-get install tmpl
4662
pip install ujson
47-
GO111MODULE="off" go get github.com/gogo/protobuf/protoc-gen-gofast
48-
GO111MODULE="off" go get github.com/gogo/protobuf/proto
49-
GO111MODULE="off" go get github.com/gogo/protobuf/jsonpb
50-
GO111MODULE="off" go get github.com/gogo/protobuf/protoc-gen-gogo
51-
GO111MODULE="off" go get github.com/gogo/protobuf/gogoproto
52-
GO111MODULE="off" go get github.com/golang/protobuf/protoc-gen-go
53-
go install golang.org/x/tools/cmd/stringer@v0.29.0
5463
5564
cd cli
65+
go install github.com/gogo/protobuf/protoc-gen-gofast
66+
go install github.com/gogo/protobuf/proto
67+
go install github.com/gogo/protobuf/jsonpb
68+
go install github.com/gogo/protobuf/protoc-gen-gogo
69+
go install github.com/gogo/protobuf/gogoproto
70+
go install github.com/golang/protobuf/protoc-gen-go
71+
go install golang.org/x/tools/cmd/stringer@v0.29.0
72+
5673
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make -e BINARY_SUFFIX=.linux-amd64 -e BRANCH=${{ github.ref_name }}
5774
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 make -e BINARY_SUFFIX=.linux-arm64 -e BRANCH=${{ github.ref_name }}
5875
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 make -e BINARY_SUFFIX=.darwin-amd64 -e BRANCH=${{ github.ref_name }}
@@ -76,7 +93,7 @@ jobs:
7693
run: |
7794
echo "IMAGE_TAG_PREFIX=${{ github.ref_name }}"|sed 's|=main$|=latest|' >> $GITHUB_ENV
7895
echo "IMAGE_TAG=$(git rev-list --count HEAD)" >> $GITHUB_ENV
79-
96+
8097
- name: upload cli
8198
run: |
8299
ossutil cp -rf cli/bin/deepflow-ctl.linux-amd64 oss://deepflow-ce/bin/ctl/${{ env.IMAGE_TAG_PREFIX }}/linux/amd64/deepflow-ctl

.github/workflows/cli-verify.yml

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: verify cli
22

3-
on:
3+
on:
44
pull_request:
55
paths:
66
- 'cli/**'
@@ -19,27 +19,44 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@master
2121
with:
22-
go-version: 1.21.x
22+
go-version: 1.24.x
23+
24+
- name: Set up GOPATH env
25+
run: echo "GOPATH=$(go env GOPATH)" >> "$GITHUB_ENV"
2326

2427
- name: Install Protoc
2528
uses: arduino/setup-protoc@v1
2629
with:
2730
version: '3.6.1'
28-
repo-token: ${{ secrets.GITHUB_TOKEN }}
31+
repo-token: ${{ secrets.GITHUB_TOKEN }}
32+
33+
- name: Checkout github.com/gogo/protobuf
34+
uses: actions/checkout@v3
35+
with:
36+
repository: 'gogo/protobuf'
37+
path: "protobuf"
38+
ref: 'v1.3.2'
39+
fetch-depth: 1
40+
41+
- name: Move github.com/gogo/protobuf to $GOPATH/src
42+
run: |
43+
mkdir -p "${{ env.GOPATH }}/src/github.com/gogo"
44+
mv protobuf "${{ env.GOPATH }}/src/github.com/gogo/protobuf"
2945
3046
- name: verify cli
3147
run: |
3248
sudo apt-get install tmpl
3349
pip install ujson
34-
GO111MODULE="off" go get github.com/gogo/protobuf/protoc-gen-gofast
35-
GO111MODULE="off" go get github.com/gogo/protobuf/proto
36-
GO111MODULE="off" go get github.com/gogo/protobuf/jsonpb
37-
GO111MODULE="off" go get github.com/gogo/protobuf/protoc-gen-gogo
38-
GO111MODULE="off" go get github.com/gogo/protobuf/gogoproto
39-
GO111MODULE="off" go get github.com/golang/protobuf/protoc-gen-go
40-
go install golang.org/x/tools/cmd/stringer@v0.29.0
4150
4251
cd cli
52+
go install github.com/gogo/protobuf/protoc-gen-gofast
53+
go install github.com/gogo/protobuf/proto
54+
go install github.com/gogo/protobuf/jsonpb
55+
go install github.com/gogo/protobuf/protoc-gen-gogo
56+
go install github.com/gogo/protobuf/gogoproto
57+
go install github.com/golang/protobuf/protoc-gen-go
58+
go install golang.org/x/tools/cmd/stringer@v0.29.0
59+
4360
go mod tidy
4461
go fmt ./...
4562
git diff

0 commit comments

Comments
 (0)