Skip to content

Commit c4ce609

Browse files
joshblumjoshblum
authored
plumb darwin arm64 platform/arch (#84)
1 parent a43cd0b commit c4ce609

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
language: go
22
go:
3-
- 1.17.3
3+
- 1.19.x
44
os:
55
- linux
66
- osx
77
script:
8-
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.43.0
8+
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.0
99
- golangci-lint run
1010
- go vet ./...
1111
- go test ./...

‎config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package slackbot
55

66
import (
77
"encoding/json"
8-
"io/ioutil"
98
"log"
9+
"os"
1010
"os/user"
1111
"path/filepath"
1212
"strings"
@@ -88,7 +88,7 @@ func readConfigOrDefault() config {
8888
return defaultConfig
8989
}
9090

91-
fileBytes, err := ioutil.ReadFile(path)
91+
fileBytes, err := os.ReadFile(path)
9292

9393
if err != nil {
9494
return defaultConfig
@@ -115,7 +115,7 @@ func (c config) Save() error {
115115
return err
116116
}
117117

118-
err = ioutil.WriteFile(path, b, 0644)
118+
err = os.WriteFile(path, b, 0644)
119119
if err != nil {
120120
return err
121121
}

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/keybase/slackbot
22

3-
go 1.17
3+
go 1.19
44

55
require (
6-
github.com/keybase/go-keybase-chat-bot v0.0.0-20211122210555-23a5230dc088
6+
github.com/keybase/go-keybase-chat-bot v0.0.0-20221214200033-f3cd3e1c607b
77
github.com/nlopes/slack v0.1.1-0.20180101221843-107290b5bbaf
88
gopkg.in/alecthomas/kingpin.v2 v2.2.6
99
)
@@ -15,11 +15,11 @@ require (
1515
github.com/kr/text v0.2.0 // indirect
1616
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
1717
github.com/pmezard/go-difflib v1.0.0 // indirect
18-
github.com/stretchr/testify v1.7.0 // indirect
18+
github.com/stretchr/testify v1.8.0 // indirect
1919
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 // indirect
2020
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
2121
gopkg.in/yaml.v2 v2.4.0 // indirect
22-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
22+
gopkg.in/yaml.v3 v3.0.1 // indirect
2323
)
2424

2525
// keybase maintained forks

‎go.sum

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
66
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
77
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9-
github.com/keybase/go-keybase-chat-bot v0.0.0-20211122210555-23a5230dc088 h1:RN48cN6j91Hw761zMFgHUQjahNIE7w2zhEzaRi9zkzc=
10-
github.com/keybase/go-keybase-chat-bot v0.0.0-20211122210555-23a5230dc088/go.mod h1:0tIbyC7O87PimRbeghiJW5JAsmdKwNmAoNWFczKDZUA=
9+
github.com/keybase/go-keybase-chat-bot v0.0.0-20221214200033-f3cd3e1c607b h1:JzWDFmtAGGkui5uZqZXfXOVJxKzJg9nFqAk4UJj4qgQ=
10+
github.com/keybase/go-keybase-chat-bot v0.0.0-20221214200033-f3cd3e1c607b/go.mod h1:Yan1Krk0q1FglHdCkNrF5hFQ4Sgq8LnuG4gI2U4xQAk=
1111
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
1212
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
1313
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -19,27 +19,21 @@ github.com/nlopes/slack v0.1.1-0.20180101221843-107290b5bbaf/go.mod h1:jVI4BBK3l
1919
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2020
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2121
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
22+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
2223
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
23-
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
24-
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
25-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
24+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
25+
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
26+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
2627
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 h1:DZshvxDdVoeKIbudAdFEKi+f70l51luSy/7b76ibTY0=
2728
golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
28-
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
29-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
30-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
31-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
32-
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
33-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
3429
gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
3530
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
3631
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3732
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
3833
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3934
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
40-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
4135
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
4236
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
4337
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
44-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
45-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
38+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
39+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎keybot/darwinbot.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin
2525
build := app.Command("build", "Build things")
2626

2727
buildDarwin := build.Command("darwin", "Start a darwin build")
28+
buildDarwinArm64 := buildDarwin.Flag("arm64", "Whether build is for arm64").Bool()
2829
buildDarwinTest := buildDarwin.Flag("test", "Whether build is for testing").Bool()
2930
buildDarwinClientCommit := buildDarwin.Flag("client-commit", "Build a specific client commit").String()
3031
buildDarwinKbfsCommit := buildDarwin.Flag("kbfs-commit", "Build a specific kbfs commit").String()
@@ -68,16 +69,23 @@ func (d *darwinbot) Run(bot *slackbot.Bot, channel string, args []string) (strin
6869
smokeTest = *buildDarwinSmoke
6970
testBuild = !*buildDarwinSmoke
7071
}
72+
platform := "darwin"
73+
arch := "amd64"
74+
if *buildDarwinArm64 {
75+
platform = "darwin-arm64"
76+
arch = "arm64"
77+
}
7178
script := launchd.Script{
7279
Label: "keybase.build.darwin",
7380
Path: "github.com/keybase/client/packaging/prerelease/pull_build.sh",
7481
BucketName: "prerelease.keybase.io",
75-
Platform: "darwin",
82+
Platform: platform,
7683
EnvVars: []launchd.EnvVar{
7784
{Key: "SMOKE_TEST", Value: boolToEnvString(smokeTest)},
7885
{Key: "TEST", Value: boolToEnvString(testBuild)},
7986
{Key: "CLIENT_COMMIT", Value: *buildDarwinClientCommit},
8087
{Key: "KBFS_COMMIT", Value: *buildDarwinKbfsCommit},
88+
{Key: "ARCH", Value: arch},
8189
// TODO: Rename to SKIP_CI in packaging scripts
8290
{Key: "NOWAIT", Value: boolToEnvString(skipCI)},
8391
{Key: "NOPULL", Value: boolToEnvString(*buildDarwinNoPull)},

‎keybot/winbot.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"bufio"
88
"bytes"
99
"fmt"
10-
"io/ioutil"
1110
"os"
1211
"os/exec"
1312
"path"
@@ -322,7 +321,7 @@ func (d *winbot) Run(bot *slackbot.Bot, channel string, args []string) (string,
322321
}()
323322
return "", nil
324323
case dumplogCmd.FullCommand():
325-
logContents, err := ioutil.ReadFile(logFileName)
324+
logContents, err := os.ReadFile(logFileName)
326325
if err != nil {
327326
return "Error reading " + logFileName, err
328327
}

‎launchd/plist.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package launchd
66
import (
77
"bytes"
88
"fmt"
9-
"io/ioutil"
109
"log"
1110
"os"
1211
"path/filepath"
@@ -183,7 +182,7 @@ func (e Env) WritePlist(script Script) (string, error) {
183182
}
184183
path := fmt.Sprintf("%s/%s.plist", plistDir, script.Label)
185184
log.Printf("Writing %s", path)
186-
if err := ioutil.WriteFile(path, data, 0755); err != nil {
185+
if err := os.WriteFile(path, data, 0755); err != nil {
187186
return "", err
188187
}
189188
return path, nil

0 commit comments

Comments
 (0)