Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
name: Analyze
runs-on: ubuntu-latest
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
permissions:
actions: read
contents: read
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
Expand All @@ -53,7 +53,7 @@ jobs:
java: ['11']
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK (include all 3 JDKs in the env)
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
java: ['8', '11', '17']
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK (include all 3 JDKs in env)
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
java: ['8']
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
java: ['8']
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
java: ['8']
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
java: ['8']
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
java: ['8']
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:
java: ['8']
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK
Expand Down Expand Up @@ -424,7 +424,7 @@ jobs:
java: [ '8' ]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK
Expand Down
15 changes: 7 additions & 8 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,20 @@ pluginManagement {
}

plugins {
id 'com.gradle.enterprise' version '3.13.2'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10'
id 'com.gradle.develocity' version '3.18.2'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
}

def isGithubActions = System.getenv('GITHUB_ACTIONS') != null
def isJenkins = System.getenv('JENKINS_URL') != null
def isCI = isGithubActions || isJenkins

gradleEnterprise {
server = "https://ge.apache.org"
develocity {
server = "https://develocity.apache.org"
projectId = "geode"
buildScan {
capture { taskInputFiles = true }
uploadInBackground = !isCI
publishAlways()
publishIfAuthenticated()
publishing.onlyIf { it.isAuthenticated() }
obfuscation {
// This obfuscates the IP addresses of the build machine in the build scan.
// Alternatively, the build scan will provide the hostname for troubleshooting host-specific issues.
Expand Down Expand Up @@ -146,7 +145,7 @@ buildCache {
enabled = !isCI
}

remote(gradleEnterprise.buildCache) {
remote(develocity.buildCache) {
enabled = false
}
}
Loading