cleanup protoc (#100)

https://github.com/livekit/livekit-server/pull/95
This commit is contained in:
hn8
2021-08-31 02:35:03 +08:00
committed by GitHub
parent 69c1d4c295
commit 32daa257bb
4 changed files with 0 additions and 47 deletions

View File

@@ -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:

View File

@@ -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:

View File

@@ -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

View File

@@ -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