github/natpass
4
0
Fork 0
mirror of https://github.com/lwch/natpass.git synced 2024-04-21 12:41:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32 from lwch/dev

Browse Source 
v0.8.6
This commit is contained in:
李文超
2022-06-27 23:50:12 -07:00
committed by GitHub
parent 692daa35c4 89db894503
commit 58bb63ab62
7 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+1
View File
@@ -15,6 +15,7 @@ jobs:
os:
- ubuntu-18.04
- ubuntu-20.04
- ubuntu-22.04
- windows-2019
- windows-2022
- macos-10.15
CHANGELOG.md
+5 -1
View File
@@ -114,4 +114,8 @@
# v0.8.5
1. 升级go版本到1.18.3
2. 修正连接失败时的panic问题
2. 修正连接失败时的panic问题
# v0.8.6
1. 升级rdesktop库，支持libx11库的静态连接
build
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/sh
VERSION=0.8.5
VERSION=0.8.6
DOCKER_BUILDKIT=1 docker build -t natpass -f contrib/build/Dockerfile .
docker run --rm \
build_all
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/sh
VERSION=0.8.5
VERSION=0.8.6
DOCKER_BUILDKIT=1 docker build -t natpass -f contrib/build/Dockerfile .
docker run --rm \
contrib/build/build_all.go
+2 -1
View File
@@ -190,14 +190,15 @@ func build(t target) {
fmt.Sprintf("GOARCH=%s", t.arch),
fmt.Sprintf("CC=%s", t.cc),
fmt.Sprintf("CXX=%s", t.cxx))
args := []string{"build", "-o", path.Join(buildDir, "np-cli"+t.ext), "-ldflags", ldflags}
if t.os == "windows" && !strings.Contains(t.arch, "arm") {
env = append(env, "CGO_ENABLED=1")
} else if t.os == "linux" && !strings.Contains(t.arch, "arm") {
env = append(env, "CGO_ENABLED=1")
ldflags += "-extldflags -static"
} else {
env = append(env, "CGO_ENABLED=0")
}
args := []string{"build", "-o", path.Join(buildDir, "np-cli"+t.ext), "-ldflags", ldflags}
args = append(args,
path.Join("code", "client", "main.go"))
cmd = exec.Command("go", args...)
go.mod
+2 -2
View File
@@ -10,11 +10,11 @@ require (
github.com/kardianos/service v1.2.1
github.com/kisielk/errcheck v1.6.1 // indirect
github.com/lwch/logging v0.0.0-20220322084100-ec48185d95ab
github.com/lwch/rdesktop v1.0.0
github.com/lwch/rdesktop v1.0.1-0.20220628063626-7a6b7d0f55ed
github.com/lwch/runtime v0.0.0-20190520054850-8c97e19e0c6d
github.com/lwch/yaml v0.0.0-20211206085137-772f80e85a26
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664
golang.org/x/text v0.3.7
golang.org/x/tools v0.1.11 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
go.sum
+6 -2
View File
@@ -19,6 +19,8 @@ github.com/lwch/logging v0.0.0-20220322084100-ec48185d95ab h1:zqeHtNXEg707Tq8gv5
github.com/lwch/logging v0.0.0-20220322084100-ec48185d95ab/go.mod h1:aXQui5bsF/d4I+z6szuiBWY5m4y9t6pyZ2Q/sLgkBBg=
github.com/lwch/rdesktop v1.0.0 h1:i+i+U5fu+400UJISSiFT+JV55yogb231PDj6ao6AMCc=
github.com/lwch/rdesktop v1.0.0/go.mod h1:vZtkNUaG1bDuzJavu8OQQoBbHVS6cYJE7y4oxtmhYYM=
github.com/lwch/rdesktop v1.0.1-0.20220628063626-7a6b7d0f55ed h1:dqhAvlOZjOp/GB74KMJ6FzIz1q8wvjTWWTrzW29/uWI=
github.com/lwch/rdesktop v1.0.1-0.20220628063626-7a6b7d0f55ed/go.mod h1:vZtkNUaG1bDuzJavu8OQQoBbHVS6cYJE7y4oxtmhYYM=
github.com/lwch/runtime v0.0.0-20190520054850-8c97e19e0c6d h1:Xg+zzPtvX22DaoJD5Bp0tqPdB8gn5WypghIJ4fluqiQ=
github.com/lwch/runtime v0.0.0-20190520054850-8c97e19e0c6d/go.mod h1:uEt0zu1MDC7WnVvodPBGSYAD/KMKk0v36xE8UE5veM8=
github.com/lwch/yaml v0.0.0-20211206085137-772f80e85a26 h1:sR3nbPhdfstDxYLp7c1EnsKH3z8+u+wgnhC3AI9/qf0=
@@ -47,8 +49,10 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098 h1:PgOr27OhUx2IRqGJ2RxAWI4dJQ7bi9cSrB82uzFzfUA=
golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU=
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU=
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=