Skip to content

Commit 924f436

Browse files
zijiren233zijiren233
authored
Merge pull request #7 from MCSManager/build/test
Build/test
2 parents a0e8c04 + 6e50c9a commit 924f436

File tree

4 files changed

+62
-17
lines changed

4 files changed

+62
-17
lines changed

‎.github/workflows/build.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,28 @@ jobs:
2121
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_windows_amd64.exe
2222
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_amd64
2323
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_arm64
24+
CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_arm
25+
CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_386
26+
CGO_ENABLED=0 GOOS=linux GOARCH=mips go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_mips
27+
CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_mips64
28+
CGO_ENABLED=0 GOOS=linux GOARCH=mips64le go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_mips64le
29+
CGO_ENABLED=0 GOOS=linux GOARCH=mipsle go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_mipsle
30+
CGO_ENABLED=0 GOOS=linux GOARCH=ppc64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_ppc64
31+
CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_ppc64le
32+
CGO_ENABLED=0 GOOS=linux GOARCH=riscv64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_riscv64
33+
CGO_ENABLED=0 GOOS=linux GOARCH=s390x go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_linux_s390x
34+
CGO_ENABLED=0 GOOS=netbsd GOARCH=386 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_netbsd_386
35+
CGO_ENABLED=0 GOOS=netbsd GOARCH=amd64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_netbsd_amd64
36+
CGO_ENABLED=0 GOOS=netbsd GOARCH=arm go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_netbsd_arm
37+
CGO_ENABLED=0 GOOS=netbsd GOARCH=arm64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_netbsd_arm64
38+
CGO_ENABLED=0 GOOS=openbsd GOARCH=386 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_openbsd_386
39+
CGO_ENABLED=0 GOOS=openbsd GOARCH=amd64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_openbsd_amd64
40+
CGO_ENABLED=0 GOOS=openbsd GOARCH=arm go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_openbsd_arm
41+
CGO_ENABLED=0 GOOS=openbsd GOARCH=arm64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_openbsd_arm64
42+
CGO_ENABLED=0 GOOS=freebsd GOARCH=386 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_freebsd_386
43+
CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_freebsd_amd64
44+
CGO_ENABLED=0 GOOS=freebsd GOARCH=arm go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_freebsd_arm
45+
CGO_ENABLED=0 GOOS=freebsd GOARCH=arm64 go build -ldflags '-s -w --extldflags "-static -fpic"' -o pty_freebsd_arm64
2446
2547
- uses: "marvinpinto/action-automatic-releases@latest"
2648
with:
@@ -32,3 +54,25 @@ jobs:
3254
pty_windows_amd64.exe
3355
pty_linux_amd64
3456
pty_linux_arm64
57+
pty_linux_arm
58+
pty_linux_386
59+
pty_linux_mips
60+
pty_linux_mips64
61+
pty_linux_mips64le
62+
pty_linux_mipsle
63+
pty_linux_ppc64
64+
pty_linux_ppc64le
65+
pty_linux_riscv64
66+
pty_linux_s390x
67+
pty_netbsd_386
68+
pty_netbsd_amd64
69+
pty_netbsd_arm
70+
pty_netbsd_arm64
71+
pty_openbsd_386
72+
pty_openbsd_amd64
73+
pty_openbsd_arm
74+
pty_openbsd_arm64
75+
pty_freebsd_386
76+
pty_freebsd_amd64
77+
pty_freebsd_arm
78+
pty_freebsd_arm64

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ require (
77
github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
88
github.com/mattn/go-colorable v0.1.13
99
github.com/shirou/gopsutil/v3 v3.22.10
10-
golang.org/x/text v0.3.7
10+
golang.org/x/text v0.4.0
1111
)
1212

1313
require (
1414
github.com/go-ole/go-ole v1.2.6 // indirect
1515
github.com/kr/text v0.2.0 // indirect
16-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
16+
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
1717
github.com/mattn/go-isatty v0.0.16 // indirect
18-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
19-
github.com/tklauser/go-sysconf v0.3.10 // indirect
20-
github.com/tklauser/numcpus v0.4.0 // indirect
18+
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
19+
github.com/tklauser/go-sysconf v0.3.11 // indirect
20+
github.com/tklauser/numcpus v0.6.0 // indirect
2121
github.com/yusufpapurcu/wmi v1.2.2 // indirect
22-
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect
22+
golang.org/x/sys v0.2.0 // indirect
2323
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2424
)

‎go.sum‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
1717
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
1818
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
1919
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
20-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
2120
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
21+
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY=
22+
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
2223
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
2324
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
2425
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
2526
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
2627
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2728
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
28-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
2929
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
30+
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
31+
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
3032
github.com/shirou/gopsutil/v3 v3.22.10 h1:4KMHdfBRYXGF9skjDWiL4RA2N+E8dRdodU/bOZpPoVg=
3133
github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk=
3234
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -36,21 +38,23 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
3638
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
3739
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
3840
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
39-
github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
4041
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
41-
github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
42+
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
43+
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
4244
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
45+
github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
46+
github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
4347
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
4448
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
4549
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4650
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4751
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4852
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4953
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
50-
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U=
51-
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
52-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
53-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
54+
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
55+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
56+
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
57+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
5458
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5559
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5660
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎utils/zip.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ func Zip(filePath []string, zipPath string) error {
3535
if err != nil {
3636
return err
3737
}
38-
if path == fPath {
39-
return nil
40-
}
4138
var zipfile io.Writer
4239
if !strings.HasSuffix(filepath.Dir(fPath), `\`) {
4340
fPath = filepath.Dir(fPath) + `\`

0 commit comments

Comments
 (0)