Skip to content

Commit 2314386

Browse files
maruelmaruel
committed
Update go to 1.17
Update dependencies Remove io/ioutil references Ran gofmt
1 parent 4517d0d commit 2314386

File tree

7 files changed

+49
-33
lines changed

7 files changed

+49
-33
lines changed

‎.github/workflows/test.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
matrix:
3131
os: [ubuntu-latest, macos-latest, windows-latest]
3232
# Do not forget to bump every 6 months!
33-
gover: ["1.18"]
33+
gover: ["1.19"]
3434
env:
3535
PYTHONDONTWRITEBYTECODE: x
3636
steps:
@@ -101,7 +101,7 @@ jobs:
101101
# Windows.
102102
os: [ubuntu-latest, macos-latest, windows-latest]
103103
# Do not forget to bump every 6 months!
104-
gover: ["1.18"]
104+
gover: ["1.19"]
105105
env:
106106
PYTHONDONTWRITEBYTECODE: x
107107
steps:
@@ -246,7 +246,10 @@ jobs:
246246
fail-fast: false
247247
matrix:
248248
os: [ubuntu-latest]
249-
gover: ['1.13.15']
249+
# https://github.com/golang/go/issues/55078
250+
# golang.org/x/sys/unix broke on Go versions before 1.17. Not worth
251+
# fixing.
252+
gover: ['1.17.13']
250253
env:
251254
PYTHONDONTWRITEBYTECODE: x
252255
steps:
@@ -270,7 +273,7 @@ jobs:
270273
matrix:
271274
os: [ubuntu-latest]
272275
# Do not forget to bump every 6 months!
273-
gover: ["1.18"]
276+
gover: ["1.19"]
274277
permissions:
275278
security-events: write
276279
steps:

‎cmd/efe/main.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"flag"
2222
"fmt"
2323
"io"
24-
"io/ioutil"
2524
"log"
2625
"os"
2726
"path/filepath"
@@ -63,9 +62,9 @@ enable_uart=1
6362
// automatically be copied to /etc/wpa_supplicant/.
6463
//
6564
// This has two advantages:
66-
// - wifi is enabled sooner in the boot process than when it's setup.sh that
67-
// does it.
68-
// - the preshared key (passphrase) is stored in hashed form.
65+
// - wifi is enabled sooner in the boot process than when it's setup.sh that
66+
// does it.
67+
// - the preshared key (passphrase) is stored in hashed form.
6968
const raspberryPiWPASupplicant = `country=%s
7069
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
7170
update_config=1
@@ -274,7 +273,7 @@ func wpaPSK(passphrase, ssid string) string {
274273
func setupFirstBoot(boot string) error {
275274
fmt.Printf("- First boot setup script\n")
276275
/* #nosec G306 */
277-
if err := ioutil.WriteFile(filepath.Join(boot, "firstboot.sh"), img.GetSetupSH(), 0o755); err != nil {
276+
if err := os.WriteFile(filepath.Join(boot, "firstboot.sh"), img.GetSetupSH(), 0o755); err != nil {
278277
return err
279278
}
280279
if len(*sshKey) != 0 {
@@ -293,7 +292,7 @@ func setupFirstBoot(boot string) error {
293292
if (image.Distro == img.RaspiOS || image.Distro == img.RaspiOS64) && len(*wifiSSID) != 0 {
294293
c := fmt.Sprintf(raspberryPiWPASupplicant, *wifiCountry, *wifiSSID, wpaPSK(*wifiPass, *wifiSSID))
295294
/* #nosec G306 */
296-
if err := ioutil.WriteFile(filepath.Join(boot, "wpa_supplicant.conf"), []byte(c), 0o644); err != nil {
295+
if err := os.WriteFile(filepath.Join(boot, "wpa_supplicant.conf"), []byte(c), 0o644); err != nil {
297296
return err
298297
}
299298
}
@@ -329,7 +328,7 @@ func mainImpl() error {
329328
// sudo setcap CAP_SYS_ADMIN,CAP_DAC_OVERRIDE=ep __file__
330329
flag.Parse()
331330
if !*v {
332-
log.SetOutput(ioutil.Discard)
331+
log.SetOutput(io.Discard)
333332
}
334333
if (*wifiSSID != "") != (*wifiPass != "") {
335334
return errors.New("use both --wifi-ssid and --wifi-pass")

‎cmd/push/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"errors"
1111
"flag"
1212
"fmt"
13-
"io/ioutil"
13+
"io"
1414
"log"
1515
"os"
1616
"os/exec"
@@ -214,7 +214,7 @@ func push(verbose bool, t tool, items []string, tags string, host, rel string) e
214214
pkgs = append(pkgs, i...)
215215
}
216216

217-
d, err := ioutil.TempDir("", "push")
217+
d, err := os.MkdirTemp("", "push")
218218
if err != nil {
219219
return err
220220
}
@@ -241,7 +241,7 @@ func mainImpl() error {
241241
pkgs = []string{"."}
242242
}
243243
if !*verbose {
244-
log.SetOutput(ioutil.Discard)
244+
log.SetOutput(io.Discard)
245245
}
246246

247247
var t tool

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module periph.io/x/bootstrap
22

3-
go 1.13
3+
go 1.17
44

55
require (
66
github.com/rekby/mbr v0.0.0-20190325193910-2b19b9cdeebc
77
github.com/ulikunitz/xz v0.5.10
8-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
9-
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0
10-
howett.net/plist v0.0.0-20201203080718-1454fab16a06
8+
golang.org/x/crypto v0.1.0
9+
golang.org/x/sys v0.1.0
10+
howett.net/plist v1.0.0
1111
)

‎go.sum

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,39 @@
11
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
2-
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
3-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
4-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
52
github.com/rekby/mbr v0.0.0-20190325193910-2b19b9cdeebc h1:LIhcsQ01OzuCmjqcggpWhs8GBGNqVPycFbBpY3suBbI=
63
github.com/rekby/mbr v0.0.0-20190325193910-2b19b9cdeebc/go.mod h1:omSwqul59wlKxf3OVbxhOiSjxM1at3GsfDbgnghKyeA=
74
github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
85
github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
9-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
10-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
6+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
7+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
8+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
9+
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
10+
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
11+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
12+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
1113
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
14+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
15+
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
16+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
17+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
18+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
1219
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1320
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14-
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 h1:xrCZDmdtoloIiooiA9q0OQb9r8HejIHYoHGhGCe1pGg=
15-
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
23+
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
24+
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1625
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
26+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
27+
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
28+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
1729
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
30+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
31+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
1832
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
33+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
34+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
35+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1936
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
20-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
21-
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
22-
howett.net/plist v0.0.0-20201203080718-1454fab16a06 h1:QDxUo/w2COstK1wIBYpzQlHX/NqaQTcf9jyz347nI58=
23-
howett.net/plist v0.0.0-20201203080718-1454fab16a06/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
37+
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
38+
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
39+
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=

‎img/boards.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"errors"
1111
"fmt"
1212
"io"
13-
"io/ioutil"
1413
"log"
1514
"net/http"
1615
"os"
@@ -487,7 +486,7 @@ func fetchURL(url string) ([]byte, error) {
487486
if r.StatusCode != 200 {
488487
return nil, fmt.Errorf("failed to fetch %q: status %d", url, r.StatusCode)
489488
}
490-
reply, err := ioutil.ReadAll(r.Body)
489+
reply, err := io.ReadAll(r.Body)
491490
if err != nil {
492491
return nil, fmt.Errorf("failed to read %q: %w", url, err)
493492
}

‎img/img.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"encoding/json"
1616
"errors"
1717
"fmt"
18-
"io/ioutil"
1918
"log"
2019
"os"
2120
"os/exec"
@@ -85,7 +84,7 @@ func GetSetupSH() []byte {
8584
}
8685
for _, v := range p {
8786
/* #nosec G304 */
88-
b, err := ioutil.ReadFile(filepath.Join(v, "setup.sh"))
87+
b, err := os.ReadFile(filepath.Join(v, "setup.sh"))
8988
if err == nil && len(b) != 0 {
9089
return b
9190
}

0 commit comments

Comments
 (0)