Skip to content

Release v1.132.0 #1246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanhamlett merged 8 commits into from
Dec 3, 2025
Merged

Release v1.132.0 #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e858b3
Fix flaky tests
gandarez Aug 27, 2025
75ed1c3
Merge pull request #1237 from wakatime/bugfix/flaky-tests
gandarez Aug 28, 2025
b28e113
Prevent many random project names on project file write error
gandarez Dec 3, 2025
af7d9ce
Merge pull request #1243 from wakatime/bugfix/random-project-names
gandarez Dec 3, 2025
4ef4a45
Improve naming of heartbeat.SanitizeConfig
alanhamlett Dec 3, 2025
1c5b444
Merge pull request #1244 from wakatime/misc/clean-naming
gandarez Dec 3, 2025
846f928
Add new languages
gandarez Dec 3, 2025
636336b
Merge pull request #1245 from wakatime/feature/new-languages
gandarez Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/on_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: Checkout
uses: actions/checkout@v4
-
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
name: Checkout
uses: actions/checkout@v4
-
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand All @@ -81,7 +81,7 @@ jobs:
name: Checkout
uses: actions/checkout@v4
-
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand All @@ -107,7 +107,7 @@ jobs:
name: Checkout
uses: actions/checkout@v4
-
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand All @@ -132,7 +132,7 @@ jobs:
name: Checkout
uses: actions/checkout@v4
-
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand All @@ -158,7 +158,7 @@ jobs:
name: Checkout
uses: actions/checkout@v4
-
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
name: Checkout
uses: actions/checkout@v4
-
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
uses: actions/checkout@v4
-
name: Setup go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -321,7 +321,7 @@ jobs:
uses: actions/checkout@v4
-
name: Setup go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -362,7 +362,7 @@ jobs:
uses: actions/checkout@v4
-
name: Setup go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -403,7 +403,7 @@ jobs:
uses: actions/checkout@v4
-
name: Setup go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -444,7 +444,7 @@ jobs:
uses: actions/checkout@v4
-
name: Setup go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -485,7 +485,7 @@ jobs:
uses: actions/checkout@v4
-
name: Setup go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down Expand Up @@ -526,7 +526,7 @@ jobs:
uses: actions/checkout@v4
-
name: Setup go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version-file: ${{ env.GO_VERSION_FILE }}
check-latest: ${{ env.CHECK_LATEST }}
Expand Down
3 changes: 3 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ run:
linters:
enable:
- bodyclose
- exhaustive
- gochecknoglobals
- gochecknoinits
- gocritic
Expand All @@ -21,6 +22,8 @@ linters:
- whitespace
- wsl_v5
settings:
exhaustive:
ignore-enum-members: "chroma.+"
revive:
rules:
- name: bare-return
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ lint: install-linter
.PHONY: vulncheck
vulncheck:
go install golang.org/x/vuln/cmd/govulncheck@latest
./bin/govulncheck-with-excludes.sh ./...
govulncheck

.PHONY: test
test:
Expand Down
11 changes: 7 additions & 4 deletions cmd/fileexperts/fileexperts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"testing"
"time"

"github.com/wakatime/wakatime-cli/cmd"
"github.com/wakatime/wakatime-cli/cmd/fileexperts"
"github.com/wakatime/wakatime-cli/pkg/api"
"github.com/wakatime/wakatime-cli/pkg/log"
"github.com/wakatime/wakatime-cli/pkg/log/setup"
"github.com/wakatime/wakatime-cli/pkg/project"

"github.com/spf13/viper"
Expand All @@ -32,7 +32,7 @@ func TestFileExperts(t *testing.T) {
numCalls int
)

projectFolder, err := filepath.Abs("../..")
projectFolder, err := filepath.Abs("testdata")
require.NoError(t, err)

subfolders := project.CountSlashesInProjectFolder(projectFolder)
Expand Down Expand Up @@ -85,7 +85,7 @@ func TestFileExperts(t *testing.T) {
v.Set("key", "00000000-0000-4000-8000-000000000000")
v.Set("api-url", testServerURL)
v.Set("plugin", plugin)
v.Set("project", "wakatime-cli")
v.Set("projectmap..*", "wakatime-cli")
v.Set("entity", "testdata/main.go")

output, err := fileexperts.FileExperts(t.Context(), v)
Expand All @@ -111,7 +111,7 @@ func TestFileExperts_NonExistingEntity(t *testing.T) {
v.Set("log-file", logFile.Name())
v.Set("verbose", true)

logger, err := cmd.SetupLogging(ctx, v)
logger, err := setup.Logging(ctx, v)
require.NoError(t, err)

defer logger.Flush()
Expand Down Expand Up @@ -143,6 +143,7 @@ func TestFileExperts_ErrApi(t *testing.T) {
v.Set("key", "00000000-0000-4000-8000-000000000000")
v.Set("api-url", testServerURL)
v.Set("entity", "testdata/main.go")
v.Set("projectmap..*", "wakatime-cli")

_, err := fileexperts.FileExperts(t.Context(), v)
require.Error(t, err)
Expand Down Expand Up @@ -177,6 +178,7 @@ func TestFileExperts_ErrAuth(t *testing.T) {
v.Set("key", "00000000-0000-4000-8000-000000000000")
v.Set("api-url", testServerURL)
v.Set("entity", "testdata/main.go")
v.Set("projectmap..*", "wakatime-cli")

_, err := fileexperts.FileExperts(t.Context(), v)
require.Error(t, err)
Expand Down Expand Up @@ -210,6 +212,7 @@ func TestFileExperts_ErrBadRequest(t *testing.T) {
v.Set("key", "00000000-0000-4000-8000-000000000000")
v.Set("api-url", testServerURL)
v.Set("entity", "testdata/main.go")
v.Set("projectmap..*", "wakatime-cli")

_, err := fileexperts.FileExperts(t.Context(), v)
require.Error(t, err)
Expand Down
10 changes: 5 additions & 5 deletions cmd/handler/option.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ func WithProjectFiltering() Preprocessor {
func WithHeartbeatSanitization() Preprocessor {
return func(params params.Params) heartbeat.HandleOption {
return heartbeat.WithSanitization(heartbeat.SanitizeConfig{
BranchPatterns: params.Heartbeat.Sanitize.HideBranchNames,
DependencyPatterns: params.Heartbeat.Sanitize.HideDependencies,
FilePatterns: params.Heartbeat.Sanitize.HideFileNames,
HideProjectFolder: params.Heartbeat.Sanitize.HideProjectFolder,
ProjectPatterns: params.Heartbeat.Sanitize.HideProjectNames,
HideBranchPatterns: params.Heartbeat.Sanitize.HideBranchNames,
HideDependencyPatterns: params.Heartbeat.Sanitize.HideDependencies,
HideFilePatterns: params.Heartbeat.Sanitize.HideFileNames,
HideProjectFolder: params.Heartbeat.Sanitize.HideProjectFolder,
HideProjectPatterns: params.Heartbeat.Sanitize.HideProjectNames,
})
}
}
Expand Down
Loading
Loading