Skip to content

Commit 28c7783

Browse files
authored
Set maven build to be published with a URL from parameters (#107)
1 parent 6cf38db commit 28c7783

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

.github/workflows/ci_cd.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,19 @@ jobs:
6363
6464
- name: Deploy to internal Maven repo
6565
if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/api-v2' || github.ref == 'refs/heads/7.x') && github.repository == 'Backblaze/b2-sdk-java-private'
66-
run: $GITHUB_WORKSPACE/gradlew publishMavenPublicationToBzArtifactoryRepository publishMavenPublicationToBzGithubPackagesRepository
66+
run: $GITHUB_WORKSPACE/gradlew publishMavenPublicationToRemoteRepository
6767
env:
68-
ORG_GRADLE_PROJECT_bzArtifactoryUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
69-
ORG_GRADLE_PROJECT_bzArtifactoryPassword: ${{ secrets.ARTIFACTORY_TOKEN }}
70-
ORG_GRADLE_PROJECT_bzGithubPackagesUsername: ${{ secrets.PACKAGES_USERNAME }}
71-
ORG_GRADLE_PROJECT_bzGithubPackagesPassword: ${{ secrets.PACKAGES_TOKEN }}
68+
ORG_GRADLE_PROJECT_remoteUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
69+
ORG_GRADLE_PROJECT_remotePassword: ${{ secrets.ARTIFACTORY_TOKEN }}
70+
ORG_GRADLE_PROJECT_publishingUrl: "${{ secrets.JF }}/maven-private/"
71+
72+
- name: Deploy to GH packages
73+
if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/api-v2' || github.ref == 'refs/heads/7.x') && github.repository == 'Backblaze/b2-sdk-java-private'
74+
run: $GITHUB_WORKSPACE/gradlew publishMavenPublicationToRemoteRepository
75+
env:
76+
ORG_GRADLE_PROJECT_remoteUsername: ${{ secrets.PACKAGES_USERNAME }}
77+
ORG_GRADLE_PROJECT_remotePassword: ${{ secrets.PACKAGES_TOKEN }}
78+
ORG_GRADLE_PROJECT_publishingUrl: "https://maven.pkg.github.com/Backblaze/repo"
7279

7380
- name: Upload to b2
7481
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/api-v2' || github.ref == 'refs/heads/7.x'

buildSrc/src/main/kotlin/b2sdk.gradle.kts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,13 @@ publishing {
134134
}
135135

136136
repositories {
137-
maven("https://artifactory.backblaze.com/artifactory/maven-private/") {
138-
name = "bzArtifactory"
139-
credentials(PasswordCredentials::class)
137+
var publishingUrl = findProperty("publishingUrl")
138+
if (publishingUrl == null) {
139+
publishingUrl = "https://maven.pkg.github.com/Backblaze/repo"
140140
}
141-
maven("https://maven.pkg.github.com/Backblaze/repo") {
142-
name = "bzGithubPackages"
141+
142+
maven(publishingUrl.toString()) {
143+
name = "remote"
143144
credentials(PasswordCredentials::class)
144145
}
145146
}

0 commit comments

Comments
 (0)