Build: Use patched newer Go version to build Windows 7 assets (#4192)

https://github.com/XTLS/go-win7
This commit is contained in:
𐲓𐳛𐳪𐳂𐳐 𐲀𐳢𐳦𐳫𐳢 𐲥𐳔𐳛𐳪𐳌𐳑𐳖𐳇 2025-01-01 16:06:35 +08:00 committed by GitHub
parent 4be32e99b2
commit c8b17ad18d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 197 additions and 48 deletions

View file

@ -2,6 +2,7 @@ package core
import (
"io"
"slices"
"strings"
"github.com/xtls/xray-core/common"
@ -64,14 +65,11 @@ func GetMergedConfig(args cmdarg.Arg) (string, error) {
supported := []string{"json", "yaml", "toml"}
for _, file := range args {
format := getFormat(file)
for _, s := range supported {
if s == format {
files = append(files, &ConfigSource{
Name: file,
Format: format,
})
break
}
if slices.Contains(supported, format) {
files = append(files, &ConfigSource{
Name: file,
Format: format,
})
}
}
return ConfigMergedFormFiles(files)