diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f53e7ba..8b55da2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,11 +62,13 @@ jobs: ./mvnw $MAVEN_ARGS ${{ matrix.os.maven.args }} clean install \ -Pjqassistant -Pdist -Pci-build -DskipITs env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + DEVELOCITY_BASE_URL: "${{ env.DEVELOCITY_BASE_URL || 'https://develocity.commonhaus.dev' }}" - name: Running integration tests in the default environment run: | ./mvnw $MAVEN_ARGS ${{ matrix.os.maven.args }} clean verify \ -Pskip-checks \ ${{ github.event.pull_request.base.ref && format('-Dincremental -Dgib.referenceBranch=refs/remotes/origin/{0}', github.event.pull_request.base.ref) || '' }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + DEVELOCITY_BASE_URL: "${{ env.DEVELOCITY_BASE_URL || 'https://develocity.commonhaus.dev' }}" diff --git a/.gitignore b/.gitignore index 5cbbb71..884b22d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,5 +38,8 @@ nb-configuration.xml # Local environment .env -# Gradle Enterprise/Develocity +# Gradle Enterprise (obsolete) /.mvn/.gradle-enterprise + +# Develocity +/.mvn/.develocity diff --git a/.mvn/gradle-enterprise.xml b/.mvn/develocity.xml similarity index 68% rename from .mvn/gradle-enterprise.xml rename to .mvn/develocity.xml index a2b86dc..28a6a00 100644 --- a/.mvn/gradle-enterprise.xml +++ b/.mvn/develocity.xml @@ -1,8 +1,8 @@ - + - https://ge.hibernate.org + #{env['DEVELOCITY_BASE_URL']?:'https://develocity.commonhaus.dev'} false @@ -16,12 +16,17 @@ + + + + + - - #{{'0.0.0.0'}} + + #{{'0.0.0.0'}} - true + true #{env['CI'] == null} @@ -33,9 +38,6 @@ #{properties['no-build-cache'] == null} #{env['CI'] != null and (env['CHANGE_ID']?:'').isBlank() and (env['GITHUB_BASE_REF']?:'').isBlank() and !(env['GRADLE_ENTERPRISE_ACCESS_KEY']?:'').isBlank()} - - https://ge.hibernate.org/cache/hsearchtest01/ - - + \ No newline at end of file diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 39d812b..95a3fd0 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,12 +1,12 @@ com.gradle - gradle-enterprise-maven-extension - 1.20.1 + develocity-maven-extension + 1.23.2 com.gradle common-custom-user-data-maven-extension - 1.13 + 2.0.1 diff --git a/Jenkinsfile b/Jenkinsfile index 60ac7e6..6f10108 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,5 @@ +@Library('hibernate-jenkins-pipeline-helpers') _ + def withMavenWorkspace(Closure body) { withMaven(jdk: 'OpenJDK 17 Latest', maven: 'Apache Maven 3.9', mavenLocalRepo: env.WORKSPACE_TMP + '/.m2repository', @@ -5,8 +7,8 @@ def withMavenWorkspace(Closure body) { artifactsPublisher(disabled: true), junitPublisher(disabled: true) ]) { - withCredentials([string(credentialsId: 'ge.hibernate.org-access-key', - variable: 'GRADLE_ENTERPRISE_ACCESS_KEY')]) { + // These credentials can only push reports. + withCredentials([string(credentialsId: 'ge.hibernate.org-access-key-pr')]) { withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline body() } @@ -21,6 +23,11 @@ pipeline { disableConcurrentBuilds(abortPrevious: true) } stages { + stage('Checks') { + steps { + requireApprovalForPullRequest 'hibernate' + } + } stage('Default build') { agent { label 'Worker&&Containers'