Skip to content

Commit 1aafc37

Browse files
committed
Revert "Go: write test go runtime version in a specific file"
This reverts commit abcd916.
1 parent abcd916 commit 1aafc37

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

.github/workflows/go-tests-other-os.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- .github/workflows/go-tests-other-os.yml
88
- .github/actions/**
99
- codeql-workspace.yml
10+
env:
11+
GO_VERSION: '~1.22.0'
1012

1113
permissions:
1214
contents: read
@@ -16,10 +18,10 @@ jobs:
1618
name: Test MacOS
1719
runs-on: macos-latest
1820
steps:
19-
- name: Set up Go
21+
- name: Set up Go ${{ env.GO_VERSION }}
2022
uses: actions/setup-go@v5
2123
with:
22-
go-version-file: go/test-runtime-version/go.work
24+
go-version: ${{ env.GO_VERSION }}
2325
cache: false
2426
id: go
2527

@@ -53,10 +55,10 @@ jobs:
5355
name: Test Windows
5456
runs-on: windows-latest-xl
5557
steps:
56-
- name: Set up Go
58+
- name: Set up Go ${{ env.GO_VERSION }}
5759
uses: actions/setup-go@v5
5860
with:
59-
go-version-file: go/test-runtime-version/go.work
61+
go-version: ${{ env.GO_VERSION }}
6062
cache: false
6163
id: go
6264

.github/workflows/go-tests.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ on:
1616
- .github/actions/**
1717
- codeql-workspace.yml
1818

19+
env:
20+
GO_VERSION: '~1.22.0'
21+
1922
permissions:
2023
contents: read
2124

@@ -25,10 +28,10 @@ jobs:
2528
name: Test Linux (Ubuntu)
2629
runs-on: ubuntu-latest-xl
2730
steps:
28-
- name: Set up Go
31+
- name: Set up Go ${{ env.GO_VERSION }}
2932
uses: actions/setup-go@v5
3033
with:
31-
go-version-file: go/test-runtime-version/go.work
34+
go-version: ${{ env.GO_VERSION }}
3235
cache: false
3336
id: go
3437

go/ql/test/go.mod

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module github.com/github/codeql-go/ql/test
2+
3+
go 1.21
4+

go/test-runtime-version/go.work

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)