Skip to content

Commit

Permalink
Merge branch 'romshark:main' into fix-http-start-behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
bastianwegge authored Aug 19, 2024
2 parents be09b2c + 636a175 commit 385fc93
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Install Go 1.22
- name: Install Go 1.23.0
uses: actions/setup-go@v4
with:
go-version: "1.22"
go-version: "1.23.0"
check-latest: true
- name: Checkout repository
uses: actions/checkout@v3
Expand Down
26 changes: 3 additions & 23 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,12 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.22"
go-version: "1.23.0"
check-latest: true
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: latest

# Optional: working directory, useful for monorepos
# working-directory: somedir

# Optional: golangci-lint command line arguments.
# args: --issues-exit-code=0

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

# Optional: if set to true then the all caching functionality will be complete disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true then the action don't cache or restore ~/go/pkg.
# skip-pkg-cache: true

# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
# skip-build-cache: true
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/romshark/templier

go 1.22.5
go 1.23.0

require (
github.com/a-h/templ v0.2.747
Expand Down
2 changes: 1 addition & 1 deletion internal/log/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func Durf(msg string, d time.Duration) {
}
fmt.Fprint(out, msg)
fmt.Fprint(out, " (")
fRed.Fprintf(out, durStr(d))
fRed.Fprintf(out, durStr(d)) // nolint: vet
fmt.Fprintln(out, ")")
}

Expand Down

0 comments on commit 385fc93

Please sign in to comment.