diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index e387a644..14f1d994 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -10,6 +10,7 @@ jobs: uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@main with: runner: ubuntu22-2-8 +# The secrets in PRs are available only for Dependabot scope secrets: - ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_RO_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_RO_PASSWORD }} diff --git a/commercial-settings.gradle b/commercial-settings.gradle index 67ea67e0..2eff642e 100644 --- a/commercial-settings.gradle +++ b/commercial-settings.gradle @@ -1,20 +1,31 @@ def artifactoryUsername = System.getenv('ARTIFACTORY_USERNAME') def artifactoryPassword = System.getenv('ARTIFACTORY_PASSWORD') +def isDependabotPr = System.getenv('GITHUB_ACTOR') == 'dependabot[bot]' + +def releaseRepository = 'https://repo.spring.io/artifactory/spring-commercial-release-remote-cache' +def snapshotRepository = 'https://repo.spring.io/artifactory/spring-commercial-snapshot-remote-cache' + +if (isCI && !isDependabotPr) { + releaseRepository 'https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-prod-local' + snapshotRepository = 'https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-dev-local' +} allprojects { repositories { - if (isCI) { - maven { - url 'https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-prod-local' + maven { + url releaseRepository + if (isCI) { credentials { username = artifactoryUsername password = artifactoryPassword } } - if (version.endsWith('SNAPSHOT')) { - maven { - url 'https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-dev-local' + } + if (version.endsWith('SNAPSHOT')) { + maven { + url snapshotRepository + if (isCI) { credentials { username = artifactoryUsername password = artifactoryPassword @@ -22,12 +33,6 @@ allprojects { } } } - else { - maven { url 'https://repo.spring.io/artifactory/spring-commercial-release-remote-cache' } - if (version.endsWith('SNAPSHOT')) { - maven { url 'https://repo.spring.io/artifactory/spring-commercial-snapshot-remote-cache' } - } - } } } \ No newline at end of file