Skip to content

Commit

Permalink
Merge branch 'release/2023.5.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Hexa committed Jan 11, 2024
2 parents 797f192 + f3b5d7f commit 2ea12ef
Show file tree
Hide file tree
Showing 8 changed files with 184 additions and 213 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/test.yaml → .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Go Build & Test
name: ci

on:
push:
Expand All @@ -8,25 +8,23 @@ on:
- "*"

jobs:
build:
name: build
ci:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
# go-version-file: ./go.mod
go-version: "^1.21.3"
go-version-file: ./go.mod

- run: go version

- run: go fmt .

- uses: dominikh/[email protected]
with:
version: "2023.1.2"
version: "2023.1.6"
install-go: false

- name: Test
Expand Down
39 changes: 18 additions & 21 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
name: Release Build
name: release

on:
push:
tags:
- '*'
- "*"

jobs:

build:
name: build
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v4
with:
# go-version-file: ./go.mod
go-version: "^1.21.3"
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: ./go.mod

- run: go install github.com/tcnksm/ghr@latest
- run: go install github.com/tcnksm/ghr@latest

- name: Build
run: |
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o dist/suzu_linux_amd64 cmd/suzu/main.go
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o dist/suzu_darwin_amd64 cmd/suzu/main.go
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o dist/suzu_darwin_arm64 cmd/suzu/main.go
gzip dist/*
- name: Build
run: |
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o dist/suzu_linux_amd64 cmd/suzu/main.go
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o dist/suzu_darwin_amd64 cmd/suzu/main.go
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o dist/suzu_darwin_arm64 cmd/suzu/main.go
gzip dist/*
- name: Release
run: |
ghr -t "${{ secrets.GITHUB_TOKEN }}" -u "${{ github.repository_owner }}" -r "suzu" --replace "${GITHUB_REF##*/}" dist/
- name: Release
run: |
ghr -t "${{ secrets.GITHUB_TOKEN }}" -u "${{ github.repository_owner }}" -r "suzu" --replace "${GITHUB_REF##*/}" dist/
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@

## develop

## 2023.5.2

- [UPDATE] go.mod の Go のバージョンを 1.21.5 にあげる
- @voluntas
- [FIX] stream 処理開始後のエラー時に、ログに出力される status code が実際にクライアントに送信した値になるように修正する
- @Hexa

## 2023.5.1

- [FIX] HTTP/2 Rapid Reset 対策として Go 1.21.3 以上でリリースバイナリを作成するよう修正する
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Sora は Suzu から送られてきた解析結果を、プッシュ API を経
- Sora から音声データを HTTP/2 経由で受け取り、音声解析サービスへ送信します
- 音声解析サービスの解析結果を HTTP/2 レスポンスで Sora に戻します
- Sora は受け取った解析結果をクライアントへプッシュで送信します
- [DataChannel 経由のシグナリング](https://sora-doc.shiguredo.jp/DATA_CHANNEL_SIGNALING) の利用を推奨します
- [DataChannel 経由のシグナリング](https://sora-doc.shiguredo.jp/DATA_CHANNEL_SIGNALING) の利用を推奨します
- 音声解析に必要とされる言語コードをクライアントごとに指定できます
- 無限リトライ対応
- mTLS 対応
Expand All @@ -55,7 +55,7 @@ sequenceDiagram
sora-)suzu: Opus over HTTP/2
note over suzu: Opus を Ogg コンテナに詰める
suzu-)gcp: Ogg over HTTP/2
note over gcp: 音声データが十分ではないためまだ解析結果が返せない
note over gcp: 音声データが十分ではないためまだ解析結果が返せない
and
client1-)sora: Opus over SRTP
sora-)suzu: Opus over HTTP/2
Expand Down Expand Up @@ -119,10 +119,11 @@ limitations under the License.

詳細は Discord やメールなどでお気軽にお問い合わせください。

- [Google Cloud Speech\-to\-Text V2 API](https://cloud.google.com/blog/products/ai-machine-learning/google-cloud-speech-to-text-v2-api?hl=en)
- [Google Cloud Media Translation](https://cloud.google.com/media-translation)
- [Microsoft Azure Speech to Text](https://azure.microsoft.com/ja-jp/products/cognitive-services/speech-to-text/) 対応
- [Microsoft Azure Speech Translation](https://azure.microsoft.com/ja-jp/products/cognitive-services/speech-translation/) 対応
- [Deepgram](https://deepgram.com/) 対応
- [AmiVoice Cloud Platform](https://acp.amivoice.com/amivoice/) 対応
- ウェブフック機能対応
- クライアントごとに接続先サービスを変更できるようになる
- クライアントごとに接続先サービスを変更できるようになる
63 changes: 35 additions & 28 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,46 +1,48 @@
module github.com/shiguredo/suzu

go 1.21
go 1.21.5

require (
cloud.google.com/go/speech v1.19.0
github.com/aws/aws-sdk-go v1.45.2
cloud.google.com/go/speech v1.21.0
github.com/aws/aws-sdk-go v1.49.16
github.com/labstack/echo-contrib v0.15.0
github.com/labstack/echo/v4 v4.11.1
github.com/labstack/echo/v4 v4.11.4
github.com/pion/randutil v0.1.0
github.com/pion/rtp v1.8.1
github.com/rs/zerolog v1.30.0
github.com/pion/rtp v1.8.3
github.com/rs/zerolog v1.31.0
github.com/stretchr/testify v1.8.4
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
golang.org/x/net v0.14.0
golang.org/x/sync v0.3.0
google.golang.org/api v0.138.0
google.golang.org/grpc v1.57.0
google.golang.org/protobuf v1.31.0
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
golang.org/x/net v0.19.0
golang.org/x/sync v0.6.0
google.golang.org/api v0.155.0
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.32.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
)

require (
cloud.google.com/go v0.110.7 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go v0.110.10 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/longrunning v0.5.1 // indirect
cloud.google.com/go/longrunning v0.5.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
Expand All @@ -50,14 +52,19 @@ require (
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 2ea12ef

Please sign in to comment.