Skip to content

Commit

Permalink
Merge pull request #38 from owulveryck/fix-v3.3
Browse files Browse the repository at this point in the history
Fix v3.3
  • Loading branch information
owulveryck authored May 15, 2023
2 parents 8fe2e35 + e68911f commit 33be954
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 119 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.20.4

- name: Install Protoc
uses: arduino/setup-protoc@v1

- name: Install the protoc-gen-gofast binary
run: go get github.com/gogo/protobuf/protoc-gen-gofast
run: go get github.com/gogo/protobuf/protoc-gen-gofast && go install github.com/gogo/protobuf/protoc-gen-gofast

- name: Generate certs
run: go generate ./...
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.20.4
- name: Install Protoc
uses: arduino/setup-protoc@v1
-
Expand All @@ -28,4 +28,4 @@ jobs:
version: latest
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ before:
- go mod download
# you may remove this if you don't need go generate
- go get github.com/gogo/protobuf/protoc-gen-gofast
- go install github.com/gogo/protobuf/protoc-gen-gofast
- go generate ./...
builds:
- env:
Expand Down
26 changes: 16 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
module github.com/owulveryck/goMarkableStream

go 1.16
go 1.20

require (
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
github.com/golang/protobuf v1.5.1
github.com/llgcode/draw2d v0.0.0-20210313082411-577c1ead272a // indirect
github.com/golang/protobuf v1.5.3
github.com/markfarnan/go-canvas v0.0.0-20200722235510-6971ccd00770
github.com/mattn/go-mjpeg v0.0.1
github.com/sethvargo/go-envconfig v0.3.2
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e
golang.org/x/net v0.0.0-20210326060303-6b1517762897
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 // indirect
google.golang.org/genproto v0.0.0-20210325224202-eed09b1b5210 // indirect
google.golang.org/grpc v1.36.1
github.com/mattn/go-mjpeg v0.0.3
github.com/sethvargo/go-envconfig v0.9.0
golang.org/x/image v0.7.0
golang.org/x/net v0.10.0
google.golang.org/grpc v1.55.0
)

require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/llgcode/draw2d v0.0.0-20210313082411-577c1ead272a // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
)
Loading

0 comments on commit 33be954

Please sign in to comment.