From 32daa257bb51a279ce9b288ca1b8bdf8a3a61cb4 Mon Sep 17 00:00:00 2001 From: hn8 <10730886+hn8@users.noreply.github.com> Date: Tue, 31 Aug 2021 02:35:03 +0800 Subject: [PATCH] cleanup protoc (#100) https://github.com/livekit/livekit-server/pull/95 --- .github/workflows/buildtest.yaml | 12 ------------ .github/workflows/docker.yaml | 14 -------------- README.md | 1 - bootstrap.sh | 20 -------------------- 4 files changed, 47 deletions(-) diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml index b05cb0319..79abb4bbd 100644 --- a/.github/workflows/buildtest.yaml +++ b/.github/workflows/buildtest.yaml @@ -17,7 +17,6 @@ jobs: path: | ~/go/pkg/mod ~/go/bin - ~/bin/protoc ~/.cache key: livekit-server - uses: shogo82148/actions-setup-redis@v1.10.3 @@ -34,17 +33,6 @@ jobs: - name: Download Go modules run: go mod download - - name: Download protoc - run: | - curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip - sudo unzip protoc-3.15.8-linux-x86_64.zip -d /usr - sudo chmod 755 /usr/bin/protoc - - - name: Install protobuf generators - run: | - go install github.com/twitchtv/twirp/protoc-gen-twirp - go install google.golang.org/protobuf/cmd/protoc-gen-go - - name: Mage Build uses: magefile/mage-action@v1 with: diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 73d52e0b9..bdac79e6d 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -17,7 +17,6 @@ jobs: path: | ~/go/pkg/mod ~/go/bin - ~/bin/protoc ~/.cache key: ${{ runner.os }}-livekit-${{ hashFiles('**/go.sum') }} restore-keys: | @@ -42,19 +41,6 @@ jobs: - name: Download Go modules run: go mod download - - name: Download protoc - run: curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip - - - name: Install protoc - run: | - sudo unzip protoc-3.15.8-linux-x86_64.zip -d /usr - sudo chmod 755 /usr/bin/protoc - - - name: Install protobuf generators - run: | - go install github.com/twitchtv/twirp/protoc-gen-twirp - go install google.golang.org/protobuf/cmd/protoc-gen-go - - name: Generate code uses: magefile/mage-action@v1 with: diff --git a/README.md b/README.md index fc1d5cb2e..205ec1d9c 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,6 @@ Pre-requisites: * Go 1.15+ is installed * GOPATH/bin is in your PATH -* [protoc](https://grpc.io/docs/protoc-installation/) is installed and in PATH Then run diff --git a/bootstrap.sh b/bootstrap.sh index 8cd073047..4d7085f29 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,11 +1,5 @@ #!/bin/bash -if ! command -v protoc &> /dev/null -then - echo "protoc is required and not found. please install" - exit 1 -fi - if ! command -v mage &> /dev/null then pushd /tmp @@ -23,17 +17,3 @@ then fi go mod download - -GO_VERSION=`go version | { read _ _ v _; echo ${v#go}; }` -GO_TARGET_VERSION=1.17 - -function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; } - -if [ $(version $GO_VERSION) -ge $(version $GO_TARGET_VERSION) ]; - then - go install github.com/twitchtv/twirp/protoc-gen-twirp@v8.1.0 - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1 - else - go get -u github.com/twitchtv/twirp/protoc-gen-twirp@v8.1.0 - go get -u google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1 -fi \ No newline at end of file