Skip to content

Commit 8a91a13

Browse files
committed
Merge branch 'master' into stash
2 parents 5e8facf + dcfbf2f commit 8a91a13

File tree

6 files changed

+19
-47
lines changed

6 files changed

+19
-47
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ updates:
44
- package-ecosystem: "gomod"
55
directory: "/"
66
schedule:
7-
interval: "weekly"
7+
interval: "monthly"
88
reviewers:
99
- "gogs/core"
1010
commit-message:

.github/workflows/go.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ env:
1919
jobs:
2020
lint:
2121
name: Lint
22+
concurrency:
23+
group: ${{ github.workflow }}-lint-${{ github.ref }}
24+
cancel-in-progress: true
2225
runs-on: ubuntu-latest
2326
steps:
2427
- name: Checkout code
25-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2629
- name: Install Go
2730
uses: actions/setup-go@v4
2831
with:
29-
go-version: 1.20.x
32+
go-version: 1.23.x
3033
- name: Check Go module tidiness
3134
shell: bash
3235
run: |
@@ -48,20 +51,15 @@ jobs:
4851
name: Test
4952
strategy:
5053
matrix:
51-
go-version: [ 1.17.x, 1.18.x, 1.19.x, 1.20.x ]
54+
go-version: [ 1.22.x, 1.23.x ]
5255
platform: [ ubuntu-latest, macos-latest, windows-latest ]
5356
runs-on: ${{ matrix.platform }}
5457
steps:
58+
- name: Checkout code
59+
uses: actions/checkout@v4
5560
- name: Install Go
56-
uses: actions/setup-go@v4
61+
uses: actions/setup-go@v5
5762
with:
5863
go-version: ${{ matrix.go-version }}
59-
- name: Checkout code
60-
uses: actions/checkout@v3
6164
- name: Run tests with coverage
6265
run: go test -v -race -coverprofile=coverage -covermode=atomic ./...
63-
- name: Upload coverage report to Codecov
64-
uses: codecov/[email protected]
65-
with:
66-
file: ./coverage
67-
flags: unittests

.github/workflows/lsif.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ go 1.16
44

55
require (
66
github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75
7-
github.com/stretchr/testify v1.8.4
8-
golang.org/x/sync v0.4.0
7+
github.com/stretchr/testify v1.9.0
8+
golang.org/x/sync v0.8.0
99
)

go.sum

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
88
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
99
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
1010
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
11+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
1112
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1213
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
13-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
1414
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
15-
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
16-
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
15+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
16+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
17+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
18+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1719
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1820
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
1921
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

repo_reference_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func TestRepository_SymbolicRef(t *testing.T) {
168168

169169
// Set a symbolic reference
170170
_, err = r.SymbolicRef(SymbolicRefOptions{
171-
Name: "TEST-REF",
171+
Name: "TEST_REF",
172172
Ref: RefsHeads + "develop",
173173
})
174174
if err != nil {
@@ -177,7 +177,7 @@ func TestRepository_SymbolicRef(t *testing.T) {
177177

178178
// Get the symbolic reference we just set
179179
ref, err = r.SymbolicRef(SymbolicRefOptions{
180-
Name: "TEST-REF",
180+
Name: "TEST_REF",
181181
})
182182
if err != nil {
183183
t.Fatal(err)

0 commit comments

Comments
 (0)