diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc56dfe8..92f7b072 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -169,10 +169,6 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - name: Sleep - run: sleep 10m # This is workaround to avoid the action failures for installing the protoc - shell: bash - - name: Install Protoc uses: arduino/setup-protoc@64c0c85d18e984422218383b81c52f8b077404d3 # v1.1.2 with: @@ -835,6 +831,10 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs + - name: Install Protoc + uses: arduino/setup-protoc@64c0c85d18e984422218383b81c52f8b077404d3 # v1.1.2 + with: + version: ${{ env.PROTOC_VERSION }} - name: Cache builds # https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d #v2.1.7 diff --git a/Makefile b/Makefile index b5270ec8..095c3582 100644 --- a/Makefile +++ b/Makefile @@ -104,9 +104,9 @@ build: $(build-targets) build-proto: ## Compiles and generates all required protobufs build-proto: cron/internal/data/request.pb.go cron/internal/data/metadata.pb.go -cron/internal/data/request.pb.go: cron/internal/data/request.proto | $(PROTOC) +cron/internal/data/request.pb.go: cron/internal/data/request.proto | $(PROTOC) install protoc --go_out=../../../ cron/internal/data/request.proto -cron/internal/data/metadata.pb.go: cron/internal/data/metadata.proto | $(PROTOC) +cron/internal/data/metadata.pb.go: cron/internal/data/metadata.proto | $(PROTOC) install protoc --go_out=../../../ cron/internal/data/metadata.proto generate-mocks: ## Compiles and generates all mocks using mockgen.