mirror of
https://github.com/XTLS/Xray-core.git
synced 2025-04-30 09:18:34 +00:00
Build: Use patched newer Go version to build Windows 7 assets (#4192)
https://github.com/XTLS/go-win7
This commit is contained in:
parent
4be32e99b2
commit
c8b17ad18d
6 changed files with 197 additions and 48 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue