Merge branch 'main' into v2

* main:
  build: use specific token for pushing release tags
  fix(gui): update `uncamel()` to handle strings like 'IDs' (fixes #10128) (#10131)
  refactor: use slices package for sort (#10132)
  build: process for automatic release tags (#10133)
  chore(gui, man, authors): update docs, translations, and contributors
This commit is contained in:
Jakob Borg
2025-05-26 14:22:30 +02:00
51 changed files with 375 additions and 115 deletions
+3 -2
View File
@@ -17,6 +17,7 @@ import (
"net/url"
"os"
"reflect"
"slices"
"sort"
"strconv"
"strings"
@@ -380,8 +381,8 @@ func (cfg *Configuration) prepareFolders(myID protocol.DeviceID, existingDevices
}
}
// Ensure that the folder list is sorted by ID
sort.Slice(cfg.Folders, func(a, b int) bool {
return cfg.Folders[a].ID < cfg.Folders[b].ID
slices.SortFunc(cfg.Folders, func(a, b FolderConfiguration) int {
return strings.Compare(a.ID, b.ID)
})
return sharedFolders, nil
}
+2 -2
View File
@@ -17,7 +17,7 @@ import (
"path/filepath"
"reflect"
"runtime"
"sort"
"slices"
"strings"
"testing"
@@ -911,7 +911,7 @@ func TestV14ListenAddressesMigration(t *testing.T) {
t.Error("Configuration was not converted")
}
sort.Strings(tc[2])
slices.Sort(tc[2])
if !reflect.DeepEqual(cfg.Options.RawListenAddresses, tc[2]) {
t.Errorf("Migration error; actual %#v != expected %#v", cfg.Options.RawListenAddresses, tc[2])
}
+5 -4
View File
@@ -7,11 +7,12 @@
package config
import (
"cmp"
"net/url"
"os"
"path"
"path/filepath"
"sort"
"slices"
"strings"
"sync"
@@ -66,8 +67,8 @@ type migrationSet []migration
func (ms migrationSet) apply(cfg *Configuration) {
// Make sure we apply the migrations in target version order regardless
// of how it was defined.
sort.Slice(ms, func(a, b int) bool {
return ms[a].targetVersion < ms[b].targetVersion
slices.SortFunc(ms, func(a, b migration) int {
return cmp.Compare(a.targetVersion, b.targetVersion)
})
// Apply all migrations.
@@ -354,7 +355,7 @@ func migrateToConfigV14(cfg *Configuration) {
cfg.Options.DeprecatedRelayServers = nil
// For consistency
sort.Strings(cfg.Options.RawListenAddresses)
slices.Sort(cfg.Options.RawListenAddresses)
var newAddrs []string
for _, addr := range cfg.Options.RawGlobalAnnServers {
+4 -3
View File
@@ -9,7 +9,8 @@ package config
import (
"encoding/json"
"encoding/xml"
"sort"
"slices"
"strings"
"github.com/syncthing/syncthing/lib/structutil"
)
@@ -84,8 +85,8 @@ func (c *VersioningConfiguration) toInternal() internalVersioningConfiguration {
for k, v := range c.Params {
tmp.Params = append(tmp.Params, internalParam{k, v})
}
sort.Slice(tmp.Params, func(a, b int) bool {
return tmp.Params[a].Key < tmp.Params[b].Key
slices.SortFunc(tmp.Params, func(a, b internalParam) int {
return strings.Compare(a.Key, b.Key)
})
return tmp
}