Skip to content

Commit 95a9dc0

Browse files
authored
Merge pull request #73 from mutagen-io/v017-backports
all: prepare for v0.17.5 release
2 parents e4c4b3a + 6d370b0 commit 95a9dc0

4 files changed

Lines changed: 63 additions & 65 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v2
3232
- uses: actions/setup-go@v2
3333
with:
34-
go-version: '1.20.12'
34+
go-version: '1.20.13'
3535
- name: "Install sha256sum"
3636
run: brew install coreutils
3737
- run: scripts/ci/setup_go.sh
@@ -70,7 +70,7 @@ jobs:
7070
timeout-minutes: 30
7171
strategy:
7272
matrix:
73-
goversion: ['1.19.13', '1.20.12']
73+
goversion: ['1.19.13', '1.20.13']
7474
steps:
7575
- uses: actions/checkout@v2
7676
- uses: actions/setup-go@v2
@@ -88,7 +88,7 @@ jobs:
8888
- uses: actions/checkout@v2
8989
- uses: actions/setup-go@v2
9090
with:
91-
go-version: '1.20.12'
91+
go-version: '1.20.13'
9292
- run: scripts/ci/setup_go.sh
9393
shell: bash
9494
- run: scripts/ci/analyze.sh

go.mod

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/docker/compose/v2 v2.15.1
99
github.com/docker/docker v20.10.20+incompatible
1010
github.com/mitchellh/mapstructure v1.5.0
11-
github.com/mutagen-io/mutagen v0.17.4
11+
github.com/mutagen-io/mutagen v0.17.5
1212
github.com/spf13/cobra v1.6.1
1313
github.com/spf13/pflag v1.0.5
1414
)
@@ -46,14 +46,13 @@ require (
4646
github.com/gofrs/flock v0.8.0 // indirect
4747
github.com/gogo/googleapis v1.4.1 // indirect
4848
github.com/gogo/protobuf v1.3.2 // indirect
49-
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
5049
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5150
github.com/golang/mock v1.6.0 // indirect
5251
github.com/golang/protobuf v1.5.3 // indirect
53-
github.com/google/go-cmp v0.5.9 // indirect
52+
github.com/google/go-cmp v0.6.0 // indirect
5453
github.com/google/gofuzz v1.2.0 // indirect
5554
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
56-
github.com/google/uuid v1.3.1 // indirect
55+
github.com/google/uuid v1.4.0 // indirect
5756
github.com/googleapis/gnostic v0.5.5 // indirect
5857
github.com/gorilla/mux v1.8.0 // indirect
5958
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -126,22 +125,22 @@ require (
126125
go.opentelemetry.io/otel/sdk v1.4.1 // indirect
127126
go.opentelemetry.io/otel/trace v1.11.2 // indirect
128127
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
129-
golang.org/x/crypto v0.16.0 // indirect
128+
golang.org/x/crypto v0.18.0 // indirect
130129
golang.org/x/mod v0.8.0 // indirect
131-
golang.org/x/net v0.19.0 // indirect
132-
golang.org/x/oauth2 v0.11.0 // indirect
133-
golang.org/x/sync v0.3.0 // indirect
134-
golang.org/x/sys v0.15.0 // indirect
135-
golang.org/x/term v0.15.0 // indirect
130+
golang.org/x/net v0.20.0 // indirect
131+
golang.org/x/oauth2 v0.14.0 // indirect
132+
golang.org/x/sync v0.5.0 // indirect
133+
golang.org/x/sys v0.16.0 // indirect
134+
golang.org/x/term v0.16.0 // indirect
136135
golang.org/x/text v0.14.0 // indirect
137136
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
138137
golang.org/x/tools v0.6.0 // indirect
139-
google.golang.org/appengine v1.6.7 // indirect
140-
google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
141-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
142-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
143-
google.golang.org/grpc v1.59.0 // indirect
144-
google.golang.org/protobuf v1.31.0 // indirect
138+
google.golang.org/appengine v1.6.8 // indirect
139+
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
140+
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
141+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
142+
google.golang.org/grpc v1.61.0 // indirect
143+
google.golang.org/protobuf v1.32.0 // indirect
145144
gopkg.in/inf.v0 v0.9.1 // indirect
146145
gopkg.in/yaml.v2 v2.4.0 // indirect
147146
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)