Merge commit '5124638a7780c44af557e889db3990e63f860692' into v2.0.0-rc

Author: jkralik

.github/workflows/v2.yml

@@ -0,0 +1,37 @@
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches:
+      - v2
+  
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  ci:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-20.04
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      
+      - name: Run a test
+        if: "!contains(github.event.head_commit.message, '[doc]')"
+        run: make test
+        
+      - name: Publish the coverage
+        if: "!contains(github.event.head_commit.message, '[doc]')"
+        run: bash <(curl -s https://codecov.io/bash)
+
+      - name: Set latest tag
+        if: "!contains(github.event.head_commit.message, '[doc]')"
+        run: echo "RELEASE_VERSION=`echo ${GITHUB_REF#refs/*/} | sed -e 's/v2/v2next/'`" >> $GITHUB_ENV
+      
+      - name: Publish docker images
+        if: "!contains(github.event.head_commit.message, '[doc]')"
+        run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin && make push LATEST_TAG=${{ env.RELEASE_VERSION }}

Makefile

@@ -98,7 +98,7 @@ test: env
         -e TEST_ROOT_CA_KEY=/certs/root_ca.key \
 		-e ACME_DB_DIR=/home/certificate-authority \
 		cloud-test \
-		go test -mod=mod -race -p 1 -v ./... -covermode=atomic -coverprofile=/home/coverage.txt
+		go test -race -p 1 -v ./... -covermode=atomic -coverprofile=/home/coverage.txt
 
 build: cloud-build $(SUBDIRS)
 
@@ -107,9 +107,9 @@ clean:
 	docker rm -f nats || true
 	docker rm -f nats-cloud-connector || true
 	docker rm -f devsim || true
-	rm -rf ./.tmp/certs || true
-	rm -rf ./.tmp/mongo || true
-	rm -rf ./.tmp/home || true
+	sudo rm -rf ./.tmp/certs || true
+	sudo rm -rf ./.tmp/mongo || true
+	sudo rm -rf ./.tmp/home || true
 
 proto/generate: $(SUBDIRS)
 push: cloud-build $(SUBDIRS) 

authorization/Makefile

@@ -24,7 +24,7 @@ push: build-servicecontainer
 	docker push plgd/$(SERVICE_NAME):$(LATEST_TAG)
 
 proto/generate:
-	protoc -I=. -I=${GOPATH}/src -I=./pb --gogofaster_out=${GOPATH}/src $(shell pwd)/pb/auth.proto
-	protoc -I=. -I=${GOPATH}/src -I=./pb --go_out=plugins=grpc:${GOPATH}/src $(shell pwd)/pb/service.proto
+	protoc -I=. -I=${GOPATH}/src -I=./pb --go_out=${GOPATH}/src $(shell pwd)/pb/auth.proto
+	protoc -I=. -I=${GOPATH}/src -I=./pb --go-grpc_out=${GOPATH}/src $(shell pwd)/pb/service.proto
 
 .PHONY: build-servicecontainer build push clean proto/generate