Skip to content

Commit ffa458c

Browse files
authored
Merge branch 'main' into k/alternative-help
2 parents 8b1392f + 6dfcb47 commit ffa458c

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

.github/workflows/go-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@ jobs:
1111
go-test:
1212
strategy:
1313
matrix:
14-
go-version: ['1.25']
1514
os: [ubuntu-latest, macos-latest, windows-latest]
1615
runs-on: ${{ matrix.os }}
1716
steps:
1817
- name: Checkout
1918
uses: actions/checkout@v4
2019
- name: Set up Go
21-
uses: actions/setup-go@v5
20+
uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
2221
with:
23-
go-version: ${{ matrix.go-version }}
22+
go-version-file: '.tool-versions'
2423
- name: (Windows) Enable pulling Go modules from private sourcegraph/sourcegraph
2524
if: runner.os == 'Windows'
2625
run: git config --global url."https://$env:PRIVATE_TOKEN@github.com/sourcegraph/".insteadOf "https://github.com/sourcegraph/"

.github/workflows/go-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
- name: Checkout
1515
uses: actions/checkout@v4
1616
- name: Set up Go
17-
uses: actions/setup-go@v5
17+
uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
1818
with:
19-
go-version: '1.25'
19+
go-version-file: '.tool-versions'
2020
- name: Enable pulling Go modules from private sourcegraph/sourcegraph
2121
run: git config --global url."https://${PRIVATE_TOKEN}@github.com/sourcegraph/".insteadOf "https://github.com/sourcegraph/"
2222
- run: ./dev/go-lint.sh

.github/workflows/goreleaser-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
with:
1818
fetch-depth: 0
1919
- name: Set up Go
20-
uses: actions/setup-go@v5
20+
uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
2121
with:
22-
go-version: '1.25'
22+
go-version-file: '.tool-versions'
2323
- name: Enable pulling Go modules from private sourcegraph/sourcegraph
2424
run: git config --global url."https://${PRIVATE_TOKEN}@github.com/sourcegraph/".insteadOf "https://github.com/sourcegraph/"
2525
- name: Check GoReleaser config

.github/workflows/goreleaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ jobs:
179179
with:
180180
fetch-depth: 0
181181
- name: Set up Go
182-
uses: actions/setup-go@v5
182+
uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
183183
with:
184-
go-version: 1.25
184+
go-version-file: '.tool-versions'
185185
- name: Enable pulling Go modules from private sourcegraph/sourcegraph
186186
run: git config --global url."https://${PRIVATE_TOKEN}@github.com/sourcegraph/".insteadOf "https://github.com/sourcegraph/"
187187
- run: go test ./...

.github/workflows/pr-auditor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
with:
1414
repository: 'sourcegraph/devx-service'
1515
token: ${{ secrets.PR_AUDITOR_TOKEN }}
16-
- uses: actions/setup-go@v5
17-
with: { go-version: '1.23' }
16+
- uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
17+
with: { go-version-file: '.tool-versions' }
1818

1919
- run: 'go run ./cmd/pr-auditor'
2020
env:

.github/workflows/scip.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Set up Go
15-
uses: actions/setup-go@v5
15+
uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
1616
with:
17-
go-version: 1.25
17+
go-version-file: '.tool-versions'
1818

1919
- name: Set directory to safe for git
2020
run: git config --global --add safe.directory $GITHUB_WORKSPACE

0 commit comments

Comments
 (0)