Skip to content

Commit 3253572

Browse files
clayburnlhotari
clayburn
authored and
lhotari
committed
[improve][ci] Publish build scans to develocity.apache.org (#23851)
(cherry picked from commit b55cd3e)
1 parent d937502 commit 3253572

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎.github/workflows/ci-maven-cache-update.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
name: Update Maven dependency cache for ${{ matrix.name }}
5151
env:
5252
JOB_NAME: Update Maven dependency cache for ${{ matrix.name }}
53-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
53+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5454
runs-on: ${{ matrix.runs-on }}
5555
timeout-minutes: 45
5656

‎.github/workflows/ci-owasp-dependency-check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
name: Check ${{ matrix.branch }}
3535
env:
3636
JOB_NAME: Check ${{ matrix.branch }}
37-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
37+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3838
runs-on: ubuntu-22.04
3939
timeout-minutes: 75
4040
strategy:

‎.github/workflows/pulsar-ci-flaky.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
env:
149149
JOB_NAME: Flaky tests suite
150150
COLLECT_COVERAGE: "${{ needs.preconditions.outputs.collect_coverage }}"
151-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
151+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
152152
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
153153
TRACE_TEST_RESOURCE_CLEANUP: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.trace_test_resource_cleanup || 'off' }}
154154
TRACE_TEST_RESOURCE_CLEANUP_DIR: ${{ github.workspace }}/target/trace-test-resource-cleanup

‎.github/workflows/pulsar-ci.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
name: Build and License check
148148
env:
149149
JOB_NAME: Build and License check
150-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
150+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
151151
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
152152
runs-on: ubuntu-22.04
153153
timeout-minutes: 60
@@ -224,7 +224,7 @@ jobs:
224224
env:
225225
JOB_NAME: CI - Unit - ${{ matrix.name }}
226226
COLLECT_COVERAGE: "${{ needs.preconditions.outputs.collect_coverage }}"
227-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
227+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
228228
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
229229
TRACE_TEST_RESOURCE_CLEANUP: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.trace_test_resource_cleanup || 'off' }}
230230
TRACE_TEST_RESOURCE_CLEANUP_DIR: ${{ github.workspace }}/target/trace-test-resource-cleanup
@@ -472,7 +472,7 @@ jobs:
472472
- linux/amd64
473473
- linux/arm64
474474
env:
475-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
475+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
476476
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
477477
IMAGE_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
478478
steps:
@@ -550,7 +550,7 @@ jobs:
550550
env:
551551
JOB_NAME: CI - Integration - ${{ matrix.name }}
552552
PULSAR_TEST_IMAGE_NAME: apachepulsar/java-test-image:latest
553-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
553+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
554554
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
555555
strategy:
556556
fail-fast: false
@@ -831,7 +831,7 @@ jobs:
831831
needs: ['preconditions', 'build-and-license-check']
832832
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
833833
env:
834-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
834+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
835835
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
836836
IMAGE_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
837837
steps:
@@ -957,7 +957,7 @@ jobs:
957957
env:
958958
JOB_NAME: CI - System - ${{ matrix.name }}
959959
PULSAR_TEST_IMAGE_NAME: apachepulsar/pulsar-test-latest-version:latest
960-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
960+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
961961
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
962962
strategy:
963963
fail-fast: false
@@ -1187,7 +1187,7 @@ jobs:
11871187
env:
11881188
JOB_NAME: CI Flaky - System - ${{ matrix.name }}
11891189
PULSAR_TEST_IMAGE_NAME: apachepulsar/pulsar-test-latest-version:latest
1190-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
1190+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
11911191
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
11921192
strategy:
11931193
fail-fast: false
@@ -1330,7 +1330,7 @@ jobs:
13301330
needs: ['preconditions', 'integration-tests']
13311331
if: ${{ needs.preconditions.outputs.docs_only != 'true' }}
13321332
env:
1333-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
1333+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
13341334
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
13351335
steps:
13361336
- name: checkout
@@ -1370,7 +1370,7 @@ jobs:
13701370
contents: read
13711371
security-events: write
13721372
env:
1373-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
1373+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
13741374
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
13751375
CODEQL_LANGUAGE: java-kotlin
13761376
steps:
@@ -1431,7 +1431,7 @@ jobs:
14311431
needs: [ 'preconditions', 'integration-tests' ]
14321432
if: ${{ needs.preconditions.outputs.need_owasp == 'true' }}
14331433
env:
1434-
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
1434+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
14351435
CI_JDK_MAJOR_VERSION: ${{ needs.preconditions.outputs.jdk_major_version }}
14361436
NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }}
14371437
steps:

‎.mvn/develocity.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
<!-- Enable Gradle Develocity extension when GRADLE_ENTERPRISE_ACCESS_KEY/DEVELOCITY_ACCESS_KEY is set and the build isn't
2525
a pull request from a branch or forked repository with a name that indicates it's a work in progress. -->
2626
<enabled>#{(env['GRADLE_ENTERPRISE_ACCESS_KEY']?.trim() > '' or env['DEVELOCITY_ACCESS_KEY']?.trim() > '') and !(env['GITHUB_HEAD_REF']?.matches('(?i).*(experiment|wip|private).*') or env['GITHUB_REPOSITORY']?.matches('(?i).*(experiment|wip|private).*'))}</enabled>
27+
<projectId>pulsar</projectId>
2728
<server>
28-
<url>https://ge.apache.org</url>
29+
<url>https://develocity.apache.org</url>
2930
<allowUntrusted>false</allowUntrusted>
3031
</server>
3132
<buildScan>
32-
<capture>
33-
<buildLogging>true</buildLogging>
34-
<testLogging>true</testLogging>
35-
</capture>
3633
<backgroundBuildScanUpload>#{isFalse(env['GITHUB_ACTIONS'])}</backgroundBuildScanUpload>
34+
<publishing>
35+
<onlyIf>authenticated</onlyIf>
36+
</publishing>
3737
<obfuscation>
3838
<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
3939
</obfuscation>

‎.mvn/extensions.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
<extension>
2525
<groupId>com.gradle</groupId>
2626
<artifactId>develocity-maven-extension</artifactId>
27-
<version>1.21.6</version>
27+
<version>1.22.2</version>
2828
</extension>
2929
<extension>
3030
<groupId>com.gradle</groupId>
3131
<artifactId>common-custom-user-data-maven-extension</artifactId>
32-
<version>2.0</version>
32+
<version>2.0.1</version>
3333
</extension>
3434
</extensions>

0 commit comments

Comments
 (0)