Merge remote-tracking branch 'origin/develop'

# Conflicts: # docs/XDAGJ_PrivateChain_Turial_zh.md # docs/XDAGJ_Private_Chain_Tutorial_eng.md
XDagger · Apr 7, 2022 · bfbf723 · bfbf723
2 parents cb1c9d0 + 0381320
commit bfbf723
Show file tree

Hide file tree

Showing 91 changed files with 1,528 additions and 862 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -5,9 +5,13 @@ name: maven ci
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - develop
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - develop
 
 jobs:
   build:
@@ -16,9 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
-      uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
-        java-version: 17
+        distribution: 'temurin'
+        java-version: '17'
+        cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/docs/XDAG：A new DAG-based cryptocurrency(Chinese ).docx b/docs/XDAG：A new DAG-based cryptocurrency(Chinese ).docx
diff --git a/docs/XDAG：A new DAG-based cryptocurrency(English).docx b/docs/XDAG：A new DAG-based cryptocurrency(English).docx
diff --git a/docs/XDAG：A new DAG-based cryptocurrency(Frence).docx b/docs/XDAG：A new DAG-based cryptocurrency(Frence).docx