From db81e1db6aa7c695d7798d7c8451426ca169dafc Mon Sep 17 00:00:00 2001 From: VRamakrishna Date: Fri, 16 Aug 2024 09:40:55 +0000 Subject: [PATCH] fix(ci): updated permissioning and versioning in GitHub Actions Also removed dead code from the Weaver Corda sample application. Signed-off-by: VRamakrishna --- .github/workflows/deploy_docs.yml | 5 +++++ .github/workflows/test_weaver-asset-exchange-fabric.yaml | 2 +- .github/workflows/test_weaver-asset-transfer.yaml | 2 +- .github/workflows/test_weaver-data-sharing.yaml | 4 ++-- .github/workflows/test_weaver-fabric-fabric-satp.yaml | 2 +- .../corda/corda-simple-application/clients/build.gradle | 1 - weaver/samples/corda/corda-simple-application/makefile | 3 --- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 475622740f7..27301e4e48e 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -49,5 +49,10 @@ jobs: run: 'python3 docs/scripts/publish_openapi.py' - name: Build and publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + permissions: + contents: write + pages: write run: git pull && mkdocs gh-deploy working-directory: docs diff --git a/.github/workflows/test_weaver-asset-exchange-fabric.yaml b/.github/workflows/test_weaver-asset-exchange-fabric.yaml index 3857198b2d0..bdaa32506e4 100644 --- a/.github/workflows/test_weaver-asset-exchange-fabric.yaml +++ b/.github/workflows/test_weaver-asset-exchange-fabric.yaml @@ -144,7 +144,7 @@ jobs: curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip unzip protoc-3.15.6-linux-x86_64.zip -d protoc go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0 # PROTOS - name: Build JS Protos diff --git a/.github/workflows/test_weaver-asset-transfer.yaml b/.github/workflows/test_weaver-asset-transfer.yaml index 932982478ca..1c120be82d4 100644 --- a/.github/workflows/test_weaver-asset-transfer.yaml +++ b/.github/workflows/test_weaver-asset-transfer.yaml @@ -728,7 +728,7 @@ jobs: curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip unzip protoc-3.15.6-linux-x86_64.zip -d protoc go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0 # PROTOS - name: Build GO Protos diff --git a/.github/workflows/test_weaver-data-sharing.yaml b/.github/workflows/test_weaver-data-sharing.yaml index 28c40df9feb..82e2de6d038 100644 --- a/.github/workflows/test_weaver-data-sharing.yaml +++ b/.github/workflows/test_weaver-data-sharing.yaml @@ -456,7 +456,7 @@ jobs: unzip protoc-3.15.6-linux-x86_64.zip -d protoc rm -rf protoc-3.15.6-linux-x86_64.zip go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0 - name: CI script for cleanup run: ./tools/ci.sh @@ -896,7 +896,7 @@ jobs: curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip unzip protoc-3.15.6-linux-x86_64.zip -d protoc go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0 # PROTOS - name: Build GO Protos diff --git a/.github/workflows/test_weaver-fabric-fabric-satp.yaml b/.github/workflows/test_weaver-fabric-fabric-satp.yaml index 87345bd2db5..12f7f72ddb2 100644 --- a/.github/workflows/test_weaver-fabric-fabric-satp.yaml +++ b/.github/workflows/test_weaver-fabric-fabric-satp.yaml @@ -73,7 +73,7 @@ jobs: curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip unzip protoc-3.15.6-linux-x86_64.zip -d protoc go install google.golang.org/protobuf/cmd/protoc-gen-go@latest - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0 # PROTOS GO - name: Build GO Protos diff --git a/weaver/samples/corda/corda-simple-application/clients/build.gradle b/weaver/samples/corda/corda-simple-application/clients/build.gradle index d24e4a7638d..7ab1cbcfbb3 100644 --- a/weaver/samples/corda/corda-simple-application/clients/build.gradle +++ b/weaver/samples/corda/corda-simple-application/clients/build.gradle @@ -49,7 +49,6 @@ repositories { dirs '../../../../core/network/corda-interop-app/interop-workflows/build/libs' dirs '../../../../sdks/corda/build/libs' dirs '../../../../common/protos-java-kt/build/libs' - dirs 'libs' } } } diff --git a/weaver/samples/corda/corda-simple-application/makefile b/weaver/samples/corda/corda-simple-application/makefile index f1535204764..ffb20efd4e6 100644 --- a/weaver/samples/corda/corda-simple-application/makefile +++ b/weaver/samples/corda/corda-simple-application/makefile @@ -1,5 +1,3 @@ -CLIKT_VERSION=$(shell grep cliktVersion ./constants.properties | cut -d '=' -f 2) - .PHONY: build-local-weaver-dependencies build-local-weaver-dependencies: echo "Building local protos..." @@ -112,4 +110,3 @@ publish-cordapps: clean: ./gradlew clean rm -rf .gradle - rm -rf clients/libs