From c4d01b65b79669d8f538ff889e9185680e37f25e Mon Sep 17 00:00:00 2001 From: Jeremy Wood Date: Mon, 18 Nov 2024 15:36:47 -0500 Subject: [PATCH] Publish to correct repo url based on version. --- .github/workflows/generic.github_release.yml | 6 ++---- build.gradle | 11 ++++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml index 616fb444d..a75ea2c03 100644 --- a/.github/workflows/generic.github_release.yml +++ b/.github/workflows/generic.github_release.yml @@ -78,10 +78,8 @@ jobs: with: arguments: > publish -x test - -PmultiverseReleasesUsername=${{ secrets.REPOSILITE_REPO_USERNAME }} - -PmultiverseReleasesPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }} - -PmultiverseSnapshotsUsername=${{ secrets.REPOSILITE_REPO_USERNAME }} - -PmultiverseSnapshotsPassword=${{ secrets.REPOSILITE_REPO_PASSWORD }} + -PmultiverseUsername=${{ secrets.REPOSILITE_REPO_USERNAME }} + -PmultiversePassword=${{ secrets.REPOSILITE_REPO_PASSWORD }} env: GITHUB_VERSION: ${{ steps.release.outputs.publish_version }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle b/build.gradle index f6bcc82fe..4ff62e252 100644 --- a/build.gradle +++ b/build.gradle @@ -127,13 +127,10 @@ publishing { } } maven { - name = "multiverseReleases" - url = "https://repo.dumptruckman.com/multiverse-releases" - credentials(PasswordCredentials) - } - maven { - name = "multiverseSnapshots" - url = "https://repo.dumptruckman.com/multiverse-snapshots" + name = "multiverse" + def releasesRepoUrl = "https://repo.dumptruckman.com/multiverse-releases" + def snapshotsRepoUrl = "https://repo.dumptruckman.com/multiverse-snapshots" + url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl credentials(PasswordCredentials) } }