From 981bb791f648038321764d714fcb176d6a00f549 Mon Sep 17 00:00:00 2001 From: Andi Date: Tue, 8 Feb 2022 17:34:56 +0100 Subject: [PATCH] Fix `installprotoc` input (#11) * Install unzip on apt-get platforms * Move well known protoc types into /usr/local/include --- .github/workflows/build-and-test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 293f343..c2e676f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -140,7 +140,7 @@ jobs: echo "cache key: ${{ runner.os }}-${{matrix.linux}}-spm-${{ hashFiles('Package.resolved') }}" - name: Install apt-get Dependencies if: matrix.linux != 'centos8' && matrix.linux != 'amazonlinux2' && (inputs.aptgetdependencies != '' || inputs.installgrpcurl || inputs.installprotoc) - run: apt-get update && apt-get install -y --no-install-recommends wget ${{ inputs.aptgetdependencies }} + run: apt-get update && apt-get install -y --no-install-recommends wget unzip ${{ inputs.aptgetdependencies }} - name: Install yum Dependencies if: matrix.linux == 'amazonlinux2' && (inputs.yumdependencies != '' || inputs.installgrpcurl || inputs.installprotoc) run: yum update -y && yum install -y wget unzip ${{ inputs.yumdependencies }} @@ -158,7 +158,8 @@ jobs: run: | wget 'https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip' unzip protoc-3.19.4-linux-x86_64.zip - mv bin/protoc /usr/local/bin + mv bin /usr/local + mv include /usr/local - uses: actions/cache@v2 with: path: .build