You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/11/14 11:13:57 UTC

[dubbo] branch 3.2 updated (001823f7bc -> 90495fa4a6)

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


    from 001823f7bc Merge branch 'apache-3.1' into apache-3.2
     add 3ee7d07135 Use remote key to start sonarcloud scan (#10936)
     new 90495fa4a6 Merge branch 'apache-3.1' into apache-3.2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/build-and-test-pr.yml | 42 +++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)


[dubbo] 01/01: Merge branch 'apache-3.1' into apache-3.2

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 90495fa4a629934d91e434cb02ac1e56d6c72dbf
Merge: 001823f7bc 3ee7d07135
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Nov 14 19:13:42 2022 +0800

    Merge branch 'apache-3.1' into apache-3.2
    
    # Conflicts:
    #       .github/workflows/build-and-test-pr.yml

 .github/workflows/build-and-test-pr.yml | 42 +++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --cc .github/workflows/build-and-test-pr.yml
index e3a77d4c1f,3f013769b4..68a5de3680
--- a/.github/workflows/build-and-test-pr.yml
+++ b/.github/workflows/build-and-test-pr.yml
@@@ -162,9 -177,31 +178,31 @@@ jobs
            key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }}
            restore-keys: |
              zookeeper-${{ runner.os }}-
-       - name: "Test with Maven with Integration Tests"
+       - uses: actions/cache@v3
+         name: "Cache secret key"
+         id: "cache-secret-cert"
+         with:
+           path: ${{ github.workspace }}/.tmp/rsa
+           key: secret-rsa-${{ runner.os }}-${{ github.run_id }}
+       - name: "Get sonarcloud token"
+         if: ${{ github.repository == 'apache/dubbo' }}
+         run: |
+           curl "http://dubbo-vm.apache.org:8000/token?workflow_id=${{ github.run_id }}" -o ${{ github.workspace }}/.tmp/encrypted-sonarcloud-token
+           openssl rsautl -decrypt -in ${{ github.workspace }}/.tmp/encrypted-sonarcloud-token -out ${{ github.workspace }}/.tmp/decrypted-sonarcloud-token -inkey ${{ github.workspace }}/.tmp/rsa/rsa_private.pem
+       - name: "Test with Maven with SonarCloud Scan"
+         if: ${{ github.repository == 'apache/dubbo' }}
          timeout-minutes: 70
-         run: ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Pjacoco,jdk15ge-simple,'!jdk15ge' -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
+         env:
+           # Needed to get some information about the pull request, if any
+           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+         run: |
+           source ${{ github.workspace }}/.tmp/decrypted-sonarcloud-token
 -          ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_dubbo -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.java [...]
++          ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco,jdk15ge-simple,'!jdk15ge' -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_dubbo -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Dr [...]
+       - name: "Test with Maven without SonarCloud Scan"
+         if: ${{ github.repository != 'apache/dubbo' }}
+         timeout-minutes: 70
+         run: |
 -          ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Pjacoco -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
++          ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Pjacoco,jdk15ge-simple,'!jdk15ge' -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
        - name: "Upload coverage to Codecov"
          uses: codecov/codecov-action@v3