Skip to content

Commit

Permalink
Merge branch 'main' into adam/feature/snapshot-service
Browse files Browse the repository at this point in the history
  • Loading branch information
Danielius1922 committed Jul 2, 2024
2 parents 95b14d1 + 6fcf2db commit f8f167d
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 77 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-publish-cfg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
echo "version=$version" >> $GITHUB_OUTPUT
- name: First try to build and push docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
# This needs to be true to proceed to the next step of failure
continue-on-error: true
# You need to specify an id to be able to tell what the status of this action was
Expand All @@ -149,7 +149,7 @@ jobs:
- name: Second try to build and push docker image when first build fails
# Only run this step if step 1 fails. It knows that step one failed because we specified an `id` for the first step
if: steps.BuildAndPush1.outcome == 'failure'
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./
platforms: linux/amd64,linux/arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publishDockerImagesGhcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
awk '{gsub("@NAME@","${{ matrix.name }}")} {gsub("@DIRECTORY@","${{ matrix.directory }}")} {print}' ${{ matrix.template_file }} > ${{ matrix.file }}
- name: Build and push docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./
platforms: linux/amd64,linux/arm64
Expand Down
2 changes: 1 addition & 1 deletion dependency/googleapis
Submodule googleapis updated 1181 files
50 changes: 25 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ require (
github.com/felixge/httpsnoop v1.0.4
github.com/fsnotify/fsnotify v1.7.0
github.com/fullstorydev/grpchan v1.1.1
github.com/fxamacker/cbor/v2 v2.6.0
github.com/go-co-op/gocron/v2 v2.5.0
github.com/fxamacker/cbor/v2 v2.7.0
github.com/go-co-op/gocron/v2 v2.7.1
github.com/gocql/gocql v1.6.0
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/golang/snappy v0.0.4
github.com/google/go-querystring v1.1.0
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.1
github.com/gorilla/websocket v1.5.3
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
github.com/hashicorp/go-multierror v1.1.1
github.com/itchyny/gojq v0.12.16
github.com/jessevdk/go-flags v1.5.0
github.com/jessevdk/go-flags v1.6.1
github.com/json-iterator/go v1.1.12
github.com/jtacoma/uritemplates v1.0.0
github.com/karrick/tparse/v2 v2.8.2
github.com/lestrrat-go/jwx/v2 v2.0.21
github.com/nats-io/nats.go v1.35.0
github.com/panjf2000/ants/v2 v2.9.1
github.com/pion/dtls/v2 v2.2.8-0.20240601040544-edc7ad02205f
github.com/lestrrat-go/jwx/v2 v2.1.0
github.com/nats-io/nats.go v1.36.0
github.com/panjf2000/ants/v2 v2.10.0
github.com/pion/dtls/v2 v2.2.8-0.20240701035148-45e16a098c47
github.com/pion/logging v0.2.2
github.com/plgd-dev/device/v2 v2.5.2-0.20240603131607-6c9b1dc14b00
github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240603125124-ff2c47df37c4
github.com/plgd-dev/device/v2 v2.5.2-0.20240702123445-f895dc844003
github.com/plgd-dev/go-coap/v3 v3.3.5-0.20240702113249-de76143e11ea
github.com/plgd-dev/kit/v2 v2.0.0-20211006190727-057b33161b90
github.com/pseudomuto/protoc-gen-doc v1.5.1
github.com/sirupsen/logrus v1.9.3
Expand All @@ -42,7 +42,7 @@ require (
github.com/ugorji/go/codec v1.2.12
github.com/vincent-petithory/dataurl v1.0.0
github.com/web-of-things-open-source/thingdescription-go v0.0.0-20240513190706-79b5f39190eb
go.mongodb.org/mongo-driver v1.15.0
go.mongodb.org/mongo-driver v1.16.0
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.52.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0
Expand All @@ -53,15 +53,15 @@ require (
go.opentelemetry.io/otel/trace v1.27.0
go.uber.org/atomic v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc
golang.org/x/net v0.25.0
golang.org/x/oauth2 v0.20.0
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
golang.org/x/net v0.26.0
golang.org/x/oauth2 v0.21.0
golang.org/x/sync v0.7.0
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094
google.golang.org/grpc v1.64.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.34.1
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -70,7 +70,7 @@ require (
github.com/Masterminds/semver v1.4.2 // indirect
github.com/Masterminds/sprig v2.15.0+incompatible // indirect
github.com/aokoli/goutils v1.0.1 // indirect
github.com/bufbuild/protocompile v0.13.0 // indirect
github.com/bufbuild/protocompile v0.14.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
Expand All @@ -91,7 +91,7 @@ require (
github.com/itchyny/timefmt-go v0.1.6 // indirect
github.com/jhump/protoreflect v1.16.0 // indirect
github.com/jonboulle/clockwork v0.4.0 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.5 // indirect
Expand All @@ -116,14 +116,14 @@ require (
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
)

// note: github.com/pion/dtls/v2/pkg/net package is not yet available in release branches,
// so we force to the use of the pinned master branch
replace github.com/pion/dtls/v2 => github.com/pion/dtls/v2 v2.2.8-0.20240601040544-edc7ad02205f
replace github.com/pion/dtls/v2 => github.com/pion/dtls/v2 v2.2.8-0.20240701035148-45e16a098c47
Loading

0 comments on commit f8f167d

Please sign in to comment.