Skip to content

Commit ce00f0d

Browse files
authored
fix(build): building arm 6 (#19756)
1 parent 79c0b9b commit ce00f0d

File tree

4 files changed

+24
-15
lines changed

4 files changed

+24
-15
lines changed

.goreleaser.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ builds:
77
goarch:
88
- amd64
99
- arm64
10+
- arm
11+
goarm:
12+
- 6
1013

1114
main: ./cmd/influx/
1215
flags:
@@ -28,6 +31,9 @@ builds:
2831
goarch:
2932
- amd64
3033
- arm64
34+
- arm
35+
goarm:
36+
- 6
3137

3238
main: ./cmd/influxd/
3339
flags:

cmd/influx/setup.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func nonInteractive() (*influxdb.OnboardingRequest, error) {
240240
return nil, err
241241
}
242242
if dur > 0 {
243-
req.RetentionPeriod = uint(dur / time.Hour)
243+
req.RetentionPeriod = dur / time.Hour
244244
}
245245
return req, nil
246246
}
@@ -283,13 +283,13 @@ func interactive() (req *influxdb.OnboardingRequest, err error) {
283283
}
284284

285285
if dur > 0 {
286-
req.RetentionPeriod = uint(dur / time.Hour)
286+
req.RetentionPeriod = dur / time.Hour
287287
} else {
288288
for {
289289
rpStr := internal2.GetInput(ui, "Please type your retention period in hours.\r\nOr press ENTER for infinite.", strconv.Itoa(influxdb.InfiniteRetention))
290290
rp, err := strconv.Atoi(rpStr)
291291
if rp >= 0 && err == nil {
292-
req.RetentionPeriod = uint(rp) * uint(time.Hour)
292+
req.RetentionPeriod = time.Duration(rp) * time.Hour
293293
break
294294
}
295295
}
@@ -299,7 +299,7 @@ func interactive() (req *influxdb.OnboardingRequest, err error) {
299299
if confirmed := internal2.GetConfirm(ui, func() string {
300300
rp := "infinite"
301301
if req.RetentionPeriod > 0 {
302-
rp = fmt.Sprintf("%d hrs", time.Duration(req.RetentionPeriod)/time.Hour)
302+
rp = fmt.Sprintf("%d hrs", req.RetentionPeriod/time.Hour)
303303
}
304304
return fmt.Sprintf(`
305305
You have entered:

cmd/influxd/upgrade/setup.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func nonInteractive() (*influxdb.OnboardingRequest, error) {
5454
return nil, err
5555
}
5656
if dur > 0 {
57-
req.RetentionPeriod = uint(dur / time.Hour)
57+
req.RetentionPeriod = dur / time.Hour
5858
}
5959
return req, nil
6060
}
@@ -97,13 +97,13 @@ func interactive() (req *influxdb.OnboardingRequest, err error) {
9797
}
9898

9999
if dur > 0 {
100-
req.RetentionPeriod = uint(dur / time.Hour)
100+
req.RetentionPeriod = dur / time.Hour
101101
} else {
102102
for {
103103
rpStr := internal.GetInput(ui, "Please type your retention period in hours.\r\nOr press ENTER for infinite.", strconv.Itoa(influxdb.InfiniteRetention))
104104
rp, err := strconv.Atoi(rpStr)
105105
if rp >= 0 && err == nil {
106-
req.RetentionPeriod = uint(rp) * uint(time.Hour)
106+
req.RetentionPeriod = time.Duration(rp) * time.Hour
107107
break
108108
}
109109
}
@@ -113,7 +113,7 @@ func interactive() (req *influxdb.OnboardingRequest, err error) {
113113
if confirmed := internal.GetConfirm(ui, func() string {
114114
rp := "infinite"
115115
if req.RetentionPeriod > 0 {
116-
rp = fmt.Sprintf("%d hrs", time.Duration(req.RetentionPeriod)/time.Hour)
116+
rp = fmt.Sprintf("%d hrs", req.RetentionPeriod/time.Hour)
117117
}
118118
return fmt.Sprintf(`
119119
You have entered:

onboarding.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package influxdb
22

3-
import "context"
3+
import (
4+
"context"
5+
"time"
6+
)
47

58
// OnboardingService represents a service for the first run.
69
type OnboardingService interface {
@@ -25,12 +28,12 @@ type OnboardingResults struct {
2528
// OnboardingRequest is the request
2629
// to setup defaults.
2730
type OnboardingRequest struct {
28-
User string `json:"username"`
29-
Password string `json:"password"`
30-
Org string `json:"org"`
31-
Bucket string `json:"bucket"`
32-
RetentionPeriod uint `json:"retentionPeriodHrs,omitempty"`
33-
Token string `json:"token,omitempty"`
31+
User string `json:"username"`
32+
Password string `json:"password"`
33+
Org string `json:"org"`
34+
Bucket string `json:"bucket"`
35+
RetentionPeriod time.Duration `json:"retentionPeriodHrs,omitempty"`
36+
Token string `json:"token,omitempty"`
3437
}
3538

3639
func (r *OnboardingRequest) Valid() error {

0 commit comments

Comments
 (0)