Skip to content

Commit b88befb

Browse files
VRamakrishnaVRamakrishna
authored
Merge pull request #472 from VRamakrishna/main
Fixed build errors, added protos-rs publish action, updated tutorial instructions
2 parents 7716671 + f356524 commit b88befb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+621
-370
lines changed

‎.github/workflows/deploy_relay-server.yml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,32 @@ on:
1515
workflow_dispatch:
1616

1717
jobs:
18+
publish-protos-rs:
19+
if: github.repository_owner == 'hyperledger-labs'
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
24+
- uses: actions/[email protected]
25+
26+
- name: Install RUST Toolchain minimal stable with clippy and rustfmt
27+
uses: actions-rs/[email protected]
28+
with:
29+
profile: minimal
30+
toolchain: stable
31+
components: rustfmt, clippy
32+
33+
- name: Publish
34+
run: cargo publish --token ${CRATES_TOKEN}
35+
env:
36+
CRATES_TOKEN: ${{ secrets.CARGO_CRATES_IO_TOKEN }}
37+
working-directory: common/protos-rs/pkg
38+
1839
relay-image:
1940
if: github.repository_owner == 'hyperledger-labs'
41+
needs: publish-protos-rs
2042
runs-on: ubuntu-latest
43+
2144
steps:
2245
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2346
- uses: actions/[email protected]
@@ -41,4 +64,4 @@ jobs:
4164
- name: Push latest tag
4265
if: ${{ env.RELAY_PUSH == 'true' }}
4366
run: (cat out | grep "exists") || make push-server-latest
44-
working-directory: core/relay
67+
working-directory: core/relay

‎.github/workflows/test_asset-exchange-fabric.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
124124
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
125125
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
126-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
126+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0
127127
128128
# PROTOS
129129
- name: Build JS Protos

‎.github/workflows/test_asset-transfer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ jobs:
454454
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
455455
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
456456
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
457-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
457+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0
458458
459459
# PROTOS
460460
- name: Build GO Protos

‎.github/workflows/test_data-sharing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ jobs:
368368
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
369369
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
370370
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
371-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
371+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0
372372
373373
# PROTOS
374374
- name: Build GO Protos
@@ -747,7 +747,7 @@ jobs:
747747
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
748748
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
749749
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
750-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
750+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0
751751
752752
# PROTOS
753753
- name: Build GO Protos

‎common/protos-java-kt/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
ext.protobuf_version = "3.11.1"
44
ext.grpc_version = "1.29.0" // CURRENT_GRPC_VERSION
55
ext.grpc_kotlin_version = "0.1.4" // CURRENT_GRPC_KOTLIN_VERSION
6-
ext.kotlin_version = "1.3.72"
6+
ext.kotlin_version = "1.4.32"
77

88
dependencies {
99
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

‎common/protos-java-kt/gradle/wrapper/gradle-wrapper.jar‎

1.25 KB
Binary file not shown.

‎common/protos-java-kt/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Jul 06 09:59:13 AEST 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

‎common/protos-java-kt/gradlew‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
109125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110126
fi
111127

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116132
JAVACMD=`cygpath --unix "$JAVACMD"`

‎common/protos-java-kt/gradlew.bat‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

‎core/drivers/corda-driver/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
2-
ext.kotlin_version = "1.3.61"
2+
ext.kotlin_version = "1.4.32"
33
ext.coroutines_version = "1.3.3"
44
ext.protobuf_version = "3.11.1"
55
ext.bcprov_version = "1.53"
66
ext.grpc_version = "1.28.1" // CURRENT_GRPC_VERSION
77
ext.grpc_kotlin_version = "0.1.3" // CURRENT_GRPC_KOTLIN_VERSION
88
ext.corda_release_group = "net.corda"
99
ext.corda_core_release_group = "net.corda"
10-
ext.corda_version = "4.8"
11-
ext.corda_core_version = "4.8"
10+
ext.corda_version = "4.8.11"
11+
ext.corda_core_version = "4.8.11"
1212
ext.arrow_version = "0.10.4"
1313
ext.weaver_version = "1.6.1"
1414

0 commit comments

Comments
 (0)