Browse Source

Use github action to install protoc

Djordje Lukic 5 years ago
parent
commit
5cbfa2778e
4 changed files with 13 additions and 10 deletions
  1. 3 0
      .github/workflows/ci.yml
  2. 6 0
      scripts/setup/install-go-gen
  3. 3 8
      scripts/setup/install-protobuf
  4. 1 2
      setup-dev.sh

+ 3 - 0
.github/workflows/ci.yml

@@ -20,6 +20,9 @@ jobs:
       - name: Checkout code into the Go module directory
         uses: actions/checkout@v2
 
+      - name: Install Protoc
+        uses: arduino/setup-protoc@master
+
       - name: Get dependencies
         run: ./setup-dev.sh
 

+ 6 - 0
scripts/setup/install-go-gen

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+go get -u github.com/gogo/protobuf/proto
+go get -u github.com/gogo/protobuf/jsonpb
+go get -u github.com/golang/protobuf/protoc-gen-go
+go get -u github.com/stevvooe/protobuild

+ 3 - 8
scripts/setup/install-protobuf

@@ -14,7 +14,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-
 #
 # Downloads and installs protobuf
 #
@@ -32,13 +31,13 @@ arm64)
 	unzip $PROTOBUF_DIR/protobuf -d /usr/local
 	;;
 
-amd64|386)
+amd64 | 386)
 	if [ "$GOOS" = windows ]; then
 		wget -O $PROTOBUF_DIR/protobuf "https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/protoc-$PROTOBUF_VERSION-win32.zip"
 	elif [ "$GOOS" = linux ]; then
 		wget -O $PROTOBUF_DIR/protobuf "https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/protoc-$PROTOBUF_VERSION-linux-x86_64.zip"
-    elif [ "$GOOS" = darwin ]; then
-        curl -Lo $PROTOBUF_DIR/protobuf "https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/protoc-$PROTOBUF_VERSION-osx-x86_64.zip"
+	elif [ "$GOOS" = darwin ]; then
+		curl -Lo $PROTOBUF_DIR/protobuf "https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/protoc-$PROTOBUF_VERSION-osx-x86_64.zip"
 	fi
 	unzip $PROTOBUF_DIR/protobuf -x readme.txt -d /usr/local
 	;;
@@ -60,7 +59,3 @@ ppc64le)
 	;;
 esac
 rm -rf $PROTOBUF_DIR
-
-go get github.com/gogo/protobuf/proto
-go get github.com/gogo/protobuf/jsonpb
-go get -u github.com/golang/protobuf/protoc-gen-go

+ 1 - 2
setup-dev.sh

@@ -26,5 +26,4 @@
 # THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ./scripts/setup/install-protobuf
-
-go get github.com/stevvooe/protobuild
+./scripts/setup/install-go-gen