Skip to content

Commit e236aa6

Browse files
committed
Merge branch 'main' into checkout-bump-4.2.2
2 parents 413bdfd + 29d4cf2 commit e236aa6

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

.github/workflows/continuous-integration-workflow.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ jobs:
66
lint:
77
runs-on: ubuntu-latest
88
steps:
9+
<<<<<<< HEAD
910
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1011
- uses: actions/setup-go@v2
12+
=======
13+
- uses: actions/checkout@v2
14+
- uses: actions/setup-go@6c1fd22b67f7a7c42ad9a45c0f4197434035e429 # v5
15+
>>>>>>> main
1116
with:
1217
go-version: "1.23"
1318
- name: Run gofmt
@@ -34,7 +39,7 @@ jobs:
3439
runs-on: ${{ matrix.platform }}
3540
steps:
3641
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37-
- uses: actions/setup-go@v2
42+
- uses: actions/setup-go@6c1fd22b67f7a7c42ad9a45c0f4197434035e429 # v5
3843
with:
3944
go-version: "1.23"
4045
- name: Test
@@ -56,7 +61,7 @@ jobs:
5661
steps:
5762
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5863
- name: Install Go
59-
uses: actions/setup-go@v2
64+
uses: actions/setup-go@6c1fd22b67f7a7c42ad9a45c0f4197434035e429 # v5
6065
with:
6166
go-version: ${{ matrix.go-version }}
6267
- name: Checkout code

0 commit comments

Comments
 (0)