fix nightly build (#271)
diff --git a/.github/workflows/nightly-dubbo-2.yml b/.github/workflows/nightly-dubbo-2.yml
index 1c3b066..f737ded 100644
--- a/.github/workflows/nightly-dubbo-2.yml
+++ b/.github/workflows/nightly-dubbo-2.yml
@@ -28,7 +28,8 @@
spring-boot.version: 1.1.12.RELEASE, 1.2.8.RELEASE, 1.3.8.RELEASE, 1.4.7.RELEASE, 1.5.22.RELEASE;
spring-boot.version: 2.0.9.RELEASE, 2.1.18.RELEASE, 2.2.12.RELEASE, 2.3.7.RELEASE, 2.4.1
'
- DUBBO_REF: master
+ DUBBO_REF: 'master'
+ DUBBO_SPRING_BOOT_REF: '2.7.x'
jobs:
build-samples:
@@ -108,6 +109,50 @@
run: |
./mvnw --batch-mode --no-transfer-progress clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
+ build-dubbo-spring-boot:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ # Map a step output to a job output
+ 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
+ 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
+
prepare_test:
runs-on: ubuntu-latest
env:
@@ -125,7 +170,7 @@
path: test/jobs
testjob:
- needs: [prepare_test, build-dubbo]
+ needs: [prepare_test, build-dubbo, build-dubbo-spring-boot]
runs-on: ubuntu-latest
env:
JAVA_VER: ${{matrix.java}}
@@ -154,6 +199,11 @@
with:
path: ~/.m2/repository/org/apache/dubbo
key: ${{ runner.os }}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
+ - name: 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: Download test list
uses: actions/download-artifact@v2
with:
diff --git a/.github/workflows/nightly-dubbo-3.yml b/.github/workflows/nightly-dubbo-3.yml
index 6649b23..ecb538b 100644
--- a/.github/workflows/nightly-dubbo-3.yml
+++ b/.github/workflows/nightly-dubbo-3.yml
@@ -28,6 +28,7 @@
spring-boot.version: 2.0.9.RELEASE, 2.1.18.RELEASE, 2.2.12.RELEASE, 2.3.7.RELEASE, 2.4.1
'
DUBBO_REF: '3.0'
+ DUBBO_SPRING_BOOT_REF: '3.0.x'
jobs:
build-samples:
@@ -107,6 +108,50 @@
run: |
./mvnw --batch-mode --no-transfer-progress clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
+ build-dubbo-spring-boot:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ # Map a step output to a job output
+ 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
+ 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
+
prepare_test:
runs-on: ubuntu-latest
env:
@@ -124,7 +169,7 @@
path: test/jobs
testjob:
- needs: [prepare_test, build-dubbo]
+ needs: [prepare_test, build-dubbo, build-dubbo-spring-boot]
runs-on: ubuntu-latest
env:
JAVA_VER: ${{matrix.java}}
@@ -153,6 +198,11 @@
with:
path: ~/.m2/repository/org/apache/dubbo
key: ${{ runner.os }}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
+ - name: 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: Download test list
uses: actions/download-artifact@v2
with:
