From 22e4703632ff23fd71b9d0725ce0831965f7cbe7 Mon Sep 17 00:00:00 2001 From: Clay Johnson Date: Tue, 21 Jan 2025 05:11:03 -0600 Subject: [PATCH] Publish build scans to develocity.apache.org (#5165) * Publish build scans to develocity.apache.org * Update Develocity plugin versions * Add a projectId * Use `DEVELOCITY_ACCESS_KEY` to authenticate to `develocity.apache.org` --- .github/workflows/ci.yml | 6 +++--- .github/workflows/code-scanning.yml | 2 +- eventmesh-operator/README.md | 4 ++-- eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf | 4 ++-- settings.gradle | 7 ++++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d63c381107..7c792b7d3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: - name: GenerateGrammarSource run: ./gradlew clean generateGrammarSource --parallel --daemon --scan env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 @@ -72,12 +72,12 @@ jobs: ./gradlew clean build dist jacocoTestReport --parallel --daemon --scan -x spotlessJava -x generateGrammarSource -x generateDistLicense -x checkDeniedLicense env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Install plugin run: ./gradlew installPlugin --scan env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Upload coverage report to codecov.io run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!' diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml index 5476923b0a..dbda7eab6b 100644 --- a/.github/workflows/code-scanning.yml +++ b/.github/workflows/code-scanning.yml @@ -68,7 +68,7 @@ jobs: if: matrix.language == 'java' run: ./gradlew clean assemble compileTestJava --parallel --daemon --scan env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Perform CodeQL analysis uses: github/codeql-action/analyze@v3 diff --git a/eventmesh-operator/README.md b/eventmesh-operator/README.md index 506c169ec9..d67dbefaf8 100644 --- a/eventmesh-operator/README.md +++ b/eventmesh-operator/README.md @@ -91,6 +91,6 @@ eventmesh-runtime-0-a-0 1/1 Running 0 12m kubectl get pods -o wide NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES -connector-rocketmq-0 1/1 Running 0 13m 127.0.0.1 minikube -eventmesh-runtime-0-a-0 1/1 Running 0 13m 127.0.0.1 minikube +connector-rocketmq-0 1/1 Running 0 13m 10.244.0.21 minikube +eventmesh-runtime-0-a-0 1/1 Running 0 13m 10.244.0.20 minikube ``` diff --git a/eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf b/eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf index 3049c4cae4..8295ebf163 100644 --- a/eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf +++ b/eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf @@ -15,7 +15,7 @@ consumerSysId 1000 consumerSysVersion 1.0.0 -consumerSvrId 127.0.0.1 +consumerSvrId 10.199.199.199 consumerDcn A00 orgId 99996 localIdc A @@ -49,7 +49,7 @@ ReqGslSwitch 0 #wemq cc configure wemqUseHttpCfg 1 -configCenterIp 127.0.0.1 +configCenterIp 10.255.34.57 configCenterPort 8090 configCenterAddrMulti 127.0.0.1:8090 #connect directly to access when: wemqUseHttpCfg 0 diff --git a/settings.gradle b/settings.gradle index 070d4f02dc..b013a57929 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,17 +16,18 @@ */ plugins { - id 'com.gradle.develocity' version '3.18.1' + id 'com.gradle.develocity' version '3.18.2' id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2' } def isCiServer = System.getenv().containsKey("CI") develocity { - server = "https://ge.apache.org" + server = "https://develocity.apache.org" + projectId = "eventmesh" buildScan { uploadInBackground = !isCiServer - publishing.onlyIf { false } + publishing.onlyIf { it.isAuthenticated() } obfuscation { ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0"} } }