Skip to content

Commit

Permalink
Use arduino/setup-protoc for installing Protoc (#903)
Browse files Browse the repository at this point in the history
Co-authored-by: Azeem Shaikh <azeems@google.com>
  • Loading branch information
azeemshaikh38 and azeemsgoogle committed Aug 25, 2021
1 parent 8cf95c4 commit cc30d54
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 26 deletions.
27 changes: 3 additions & 24 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,11 @@ name: build
on: [push, pull_request]
jobs:
validate:
name: Validate
name: Validate
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
- name: Cache protobuf library.
id: cache-protobuf
uses: actions/cache@d9747005de0f7240e5d35a68dca96b3f41b8b340
with:
path: protobuf
key: ${{ runner.os }}-protobuf
- name: Build protobuf library.
if: steps.cache-protobuf.outputs.cache-hit != 'true'
run: |
git clone https://github.com/protocolbuffers/protobuf.git
cd protobuf
git submodule update --init --recursive
./autogen.sh
./autogen.sh # see https://github.com/protocolbuffers/protobuf/issues/149
./configure
make
make check
- name: Install protobuf library
run: |
cd protobuf
sudo make install
sudo ldconfig
- name: Install Protoc
uses: arduino/setup-protoc@v1
- name: Clone the code
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
with:
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,7 @@ tree-status: ## Verify tree is clean and all changes are committed
###############################################################################

################################## make build #################################
# TODO(azeems): Re-enable build-proto
build-targets = generate-docs build-scorecard build-pubsub build-bq-transfer \
build-targets = generate-docs build-proto build-scorecard build-pubsub build-bq-transfer \
build-add-script build-validate-script build-update-script dockerbuild
.PHONY: build $(build-targets)
build: ## Build all binaries and images in the reepo.
Expand Down

0 comments on commit cc30d54

Please sign in to comment.