Improve dubbo cache (#1)

Merge Dubbo-Spring-Boot build with Dubbo

Author: AlbumenJ

.github/workflows/build-and-test.yml

@@ -20,6 +20,13 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
+        with:
+          path: dubbo
+      - uses: actions/checkout@v2
+        with:
+          repository: 'apache/dubbo-spring-boot-project'
+          ref: ${{env.DUBBO_SPRING_BOOT_REF}}
+          path: dubbo-spring-boot-project
       - uses: actions/setup-java@v1
         with:
           java-version: 8
@@ -33,16 +40,17 @@ jobs:
         with:
           path: ~/.m2/repository/org/apache/dubbo
           key: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }}
-      - name: "Build with Maven"
+      - name: "Build Dubbo with Maven"
         run: |
+          cd ./dubbo
           ./mvnw --batch-mode -U -e --no-transfer-progress  clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
-          # just keep dubbo modules, remove dubbo-spring-boot-* modules from maven local repo
-          cd  ~/.m2/repository/org/apache/dubbo
-          ls | grep dubbo-spring-boot | xargs -I {} rm -rf {}
-          echo "removed dubbo-spring-boot* modules in local repo"
+      - name: "Build Dubbo Spring Boot with Maven"
+        run: |
+          cd ./dubbo-spring-boot-project
+          ./mvnw --batch-mode --no-transfer-progress  clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
       - name: "Calculate Dubbo Version"
         run: |
-          REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' pom.xml`
+          REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' ./dubbo/pom.xml`
           mkdir dubbo-version
           echo $REVISION > dubbo-version/dubbo-version
       - name: "Upload Dubbo version"
@@ -51,52 +59,6 @@ jobs:
           name: dubbo-version
           path: dubbo-version
 
-  build-dubbo-spring-boot:
-    needs: build-source
-    runs-on: ubuntu-latest
-    outputs:
-      commit_id: ${{ steps.git-checker.outputs.commit_id }}
-      cache-hit: ${{ steps.dubbocache.outputs.cache-hit }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          repository: 'apache/dubbo-spring-boot-project'
-          ref: ${{env.DUBBO_SPRING_BOOT_REF}}
-      - name: "Get commit id"
-        id: git-checker
-        run: |
-          #compare dubbo commit id
-          last_commit_id=`git log --format="%H" -n 1`
-          echo "::set-output name=commit_id::$last_commit_id"
-          echo "commit_id: $last_commit_id"
-      - name: "Dubbo-spring-boot cache"
-        id: dubbocache
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository/org/apache/dubbo
-          key: ${{ runner.os }}-dubbo-spring-boot-snapshot-${{steps.git-checker.outputs.commit_id}}
-      - name: "Cache local Maven repository"
-        if: steps.dubbocache.outputs.cache-hit != 'true'
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-dubbo-spring-boot-${{env.DUBBO_SPRING_BOOT_REF}}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-dubbo-spring-boot-${{env.DUBBO_SPRING_BOOT_REF}}-maven-
-      - name: "Set up JDK 8"
-        if: steps.dubbocache.outputs.cache-hit != 'true'
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8
-      - name: "Build dubbo spring boot"
-        if: steps.dubbocache.outputs.cache-hit != 'true'
-        run: |
-          ./mvnw --batch-mode --no-transfer-progress  clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
-          # just keep dubbo-spring-boot-* modules, remove other dubbo modules from maven local repo
-          cd  ~/.m2/repository/org/apache/dubbo
-          ls | grep -v dubbo-spring-boot | xargs -I {} rm -rf {}
-          echo "modules in `pwd`:" && ls
-
   unit-test:
     needs: [build-source]
     name: "Unit Test On ${{ matrix.os }} (JDK: ${{ matrix.jdk }})"
@@ -151,7 +113,7 @@ jobs:
           path: test/jobs
 
   integration-test-job:
-    needs: [build-source, build-dubbo-spring-boot, integration-test-prepare]
+    needs: [build-source, integration-test-prepare]
     name: "Integration Test on ubuntu-18.04 (JobId: ${{matrix.job_id}})"
     runs-on: ubuntu-18.04
     timeout-minutes: 30
@@ -174,11 +136,6 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - name: "Restore Dubbo-spring-boot cache"
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository/org/apache/dubbo
-          key: ${{ runner.os }}-dubbo-spring-boot-snapshot-${{needs.build-dubbo-spring-boot.outputs.commit_id}}
       - name: "Restore Dubbo cache"
         uses: actions/cache@v2
         with: