Skip to content

Commit aff42a0

Browse files
committed
fix-go-test-pipeline
1 parent 8f22efa commit aff42a0

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

.github/workflows/ci.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@ jobs:
44
go-lint:
55
runs-on: ubuntu-latest
66
steps:
7+
<<<<<<< Updated upstream
8+
||||||| Stash base
9+
- name: Install Go
10+
uses: actions/setup-go@v4
11+
with:
12+
go-version: 1.22.x
13+
=======
14+
- name: Install Go
15+
uses: actions/setup-go@v5
16+
with:
17+
go-version: 1.24.x
18+
>>>>>>> Stashed changes
719
- name: Checkout code
820
uses: actions/checkout@v4
921
- name: Install Go
@@ -18,6 +30,12 @@ jobs:
1830
go-test:
1931
strategy:
2032
matrix:
33+
<<<<<<< Updated upstream
34+
||||||| Stash base
35+
go-version: [1.22.x]
36+
=======
37+
go-version: [1.24.x]
38+
>>>>>>> Stashed changes
2139
platform: [ubuntu-latest]
2240
runs-on: ${{ matrix.platform }}
2341
steps:

0 commit comments

Comments
 (0)