Skip to content

Commit c726b72

Browse files
authored
Merge branch 'main' into test-ci
2 parents 162620f + 3db4a28 commit c726b72

31 files changed

+417
-108
lines changed

.github/.testcoverage-local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ threshold:
66
total: 98
77
override:
88
- path: badgestorer/github.go$ ## is integration test
9-
threshold: 64
9+
threshold: 43
1010
- path: path/path.go$ ## requires windows to be tested
1111
threshold: 66
1212
exclude:

.github/workflows/action-docker-test.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: action-test (docker version)
2-
on: [push]
2+
on:
3+
pull_request:
4+
merge_group:
35
jobs:
46
build-dev-image:
57
name: build dev image
@@ -8,7 +10,7 @@ jobs:
810
runs-on: ubuntu-latest
911
steps:
1012
- name: checkout
11-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1214

1315
- name: login to GitHub container registry
1416
uses: docker/login-action@v3
@@ -40,10 +42,10 @@ jobs:
4042

4143
steps:
4244
- name: checkout
43-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4446

4547
- name: setup go
46-
uses: actions/setup-go@v5
48+
uses: actions/setup-go@v6
4749
with:
4850
go-version-file: go.mod
4951

.github/workflows/action-source-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77

88
steps:
99
- name: checkout
10-
uses: actions/checkout@v4
10+
uses: actions/checkout@v5
1111

1212
- name: setup go
13-
uses: actions/setup-go@v5
13+
uses: actions/setup-go@v6
1414
with:
1515
go-version-file: go.mod
1616

.github/workflows/lint.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
name: lint
2-
on: [push]
2+
on:
3+
pull_request:
4+
merge_group:
35
jobs:
46
lint:
57
name: lint
68
runs-on: ubuntu-latest
79
steps:
810
- name: checkout
9-
uses: actions/checkout@v4
11+
uses: actions/checkout@v5
1012
- name: setup go
11-
uses: actions/setup-go@v5
13+
uses: actions/setup-go@v6
1214
with:
1315
go-version-file: go.mod
1416
- name: go mod tidy check
1517
uses: katexochen/go-tidy-check@v2
1618
- name: golangci-lint
17-
uses: golangci/golangci-lint-action@v7
19+
uses: golangci/golangci-lint-action@v9
1820
with:
19-
version: v2.0.1 # LINT_VERSION: update version in other places
21+
version: v2.6.1 # LINT_VERSION: update version in other places
2022
- id: govulncheck
2123
uses: golang/govulncheck-action@v1

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
name: semantic title
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: amannn/action-semantic-pull-request@v5
19+
- uses: amannn/action-semantic-pull-request@v6
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
packages: write
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

16-
- uses: actions/setup-go@v5
16+
- uses: actions/setup-go@v6
1717
with:
1818
go-version-file: go.mod
1919

@@ -29,7 +29,7 @@ jobs:
2929
3030
- name: update the major version tag
3131
id: majorver
32-
uses: actions/publish-action@v0.3.0
32+
uses: actions/publish-action@v0.4.0
3333
with:
3434
source-tag: ${{ env.RELEASE_VERSION }}
3535

.github/workflows/test.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: test
2-
on: [push]
2+
on:
3+
pull_request:
4+
merge_group:
35
permissions:
46
contents: write
57
pull-requests: write
@@ -12,9 +14,9 @@ jobs:
1214

1315
steps:
1416
- name: checkout
15-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1618
- name: setup go
17-
uses: actions/setup-go@v5
19+
uses: actions/setup-go@v6
1820
with:
1921
go-version-file: go.mod
2022

@@ -24,7 +26,7 @@ jobs:
2426
run: go test -race -count=1 -failfast -shuffle=on -coverprofile=${{ matrix.os }}-profile -covermode=atomic -coverpkg=./... ./...
2527

2628
- name: upload cover profile artifact
27-
uses: actions/upload-artifact@v4
29+
uses: actions/upload-artifact@v5
2830
with:
2931
name: ${{ matrix.os }}-profile
3032
path: ${{ matrix.os }}-profile
@@ -36,18 +38,18 @@ jobs:
3638

3739
steps:
3840
- name: checkout
39-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4042

4143
- name: download ubuntu-latest-profile
42-
uses: actions/download-artifact@v4
44+
uses: actions/download-artifact@v6
4345
with:
4446
name: ubuntu-latest-profile
4547
- name: download macos-latest-profile
46-
uses: actions/download-artifact@v4
48+
uses: actions/download-artifact@v6
4749
with:
4850
name: macos-latest-profile
4951
- name: download windows-latest-profile
50-
uses: actions/download-artifact@v4
52+
uses: actions/download-artifact@v6
5153
with:
5254
name: windows-latest-profile
5355

@@ -73,7 +75,7 @@ jobs:
7375
diff-base-breakdown-file-name: ${{ steps.download-main-breakdown.outputs.found_artifact == 'true' && 'main.breakdown' || '' }}
7476

7577
- name: upload artifact (main.breakdown)
76-
uses: actions/upload-artifact@v4
78+
uses: actions/upload-artifact@v5
7779
if: github.ref_name == 'main'
7880
with:
7981
name: main.breakdown

.golangci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ linters:
1414
- dupl
1515
- dupword
1616
- durationcheck
17+
- embeddedstructfieldcheck
1718
- err113
1819
- errchkjson
1920
- errname
@@ -24,6 +25,7 @@ linters:
2425
- forbidigo
2526
- forcetypeassert
2627
- funlen
28+
- funcorder
2729
- gocheckcompilerdirectives
2830
- gochecknoglobals
2931
- gochecknoinits
@@ -44,6 +46,7 @@ linters:
4446
- inamedparam
4547
- interfacebloat
4648
- intrange
49+
- iotamixing
4750
- lll
4851
- loggercheck
4952
- maintidx
@@ -86,7 +89,7 @@ linters:
8689
- wastedassign
8790
- whitespace
8891
- wrapcheck
89-
- wsl
92+
- wsl_v5
9093
- zerologlint
9194
settings:
9295
dupl:

.testcoverage.example.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ exclude:
4141
- \.pb\.go$ # excludes all protobuf generated files
4242
- ^pkg/bar # exclude package `pkg/bar`
4343

44+
# (optional; default false)
45+
# When true, requires all coverage-ignore annotations to include explanatory comments
46+
force-annotation-comment: false
47+
4448
# If specified, saves the current test coverage breakdown to this file.
4549
#
4650
# Typically, this breakdown is generated only for main (base) branches and
@@ -60,12 +64,12 @@ diff:
6064
# Allowed threshold for the test coverage difference (in percentage)
6165
# between the feature branch and the base branch.
6266
#
63-
# By default, this is disabled (set to nil). Valid values range from
67+
# By default, this is disabled (set to null). Valid values range from
6468
# -100.0 to +100.0.
6569
#
6670
# Example:
6771
# If set to 0.5, an error will be reported if the feature branch has
6872
# less than 0.5% more coverage than the base.
6973
#
7074
# If set to -0.5, the check allows up to 0.5% less coverage than the base.
71-
threshold: nil
75+
threshold: null

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GO_VERSION: automatically update to most recent via dependabot
2-
FROM golang:1.24.5 AS builder
2+
FROM golang:1.25.3 AS builder
33
WORKDIR /workspace
44

55
COPY go.mod go.mod

0 commit comments

Comments
 (0)