Skip to content

Commit c611580

Browse files
authored
Merge pull request #694 from ywy2090/master-ChangeLog
update netty-sm-ssl-context
2 parents 3e86746 + 15064af commit c611580

File tree

2 files changed

+34
-4
lines changed

2 files changed

+34
-4
lines changed

.github/workflows/workflow.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Java-SDK GitHub Actions
2+
on:
3+
push:
4+
pull_request:
5+
release:
6+
types: [published, created, edited]
7+
env:
8+
CCACHE_DIR: ${{ github.workspace }}/ccache
9+
10+
jobs:
11+
build:
12+
name: build
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
matrix:
16+
os: [ubuntu-18.04, ubuntu-16.04, macos-latest]
17+
steps:
18+
- uses: actions/checkout@v2
19+
with:
20+
fetch-depth: 5
21+
- name: check commit
22+
if: ${{ runner.os == 'Linux' && github.base_ref != 'master' && github.event_name == 'pull_request' }}
23+
run: bash .ci/ci_check_commit.sh
24+
- name: install macOS dependencies
25+
if: runner.os == 'macOS'
26+
run: brew install [email protected] openjdk
27+
- name: install Ubuntu dependencies
28+
if: runner.os == 'Linux'
29+
run: sudo apt-get update && sudo apt install -y git curl libssl-dev default-jdk build-essential
30+
- name: compile and run ut
31+
run: ./gradlew build -x integrationTest
32+
- name: run integration testing
33+
run: /bin/bash .ci/ci_check.sh

build.gradle

+1-4
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,10 @@ dependencies {
6969
// compile 'io.netty:netty-tcnative:2.0.25.Final'
7070
// compile 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final'
7171
// compile 'org.fisco-bcos:netty-sm-ssl-context:1.0.0-SNAPSHOT'
72-
compile ('org.fisco-bcos:netty-sm-ssl-context:1.0.0') {
72+
compile ('org.fisco-bcos:netty-sm-ssl-context:1.1.0') {
7373
exclude module:"log4j"
7474
}
7575

76-
// update tcnative version
77-
compile 'org.fisco-bcos:tcnative:2.0.30.0-SNAPSHOT'
78-
7976
compile 'org.ethereum:solcJ-all:0.4.25'
8077
compile 'io.netty:netty-all:4.1.50.Final'
8178
compile 'com.google.guava:guava:29.0-jre'

0 commit comments

Comments
 (0)