Fix deploy config
This commit is contained in:
parent
ef81ce64e1
commit
b4baf33b02
3 changed files with 11 additions and 6 deletions
5
.github/workflows/deploy.yml
vendored
5
.github/workflows/deploy.yml
vendored
|
@ -19,6 +19,7 @@ jobs:
|
|||
restore-keys: |
|
||||
${{ runner.os }}-gradle-
|
||||
- uses: gradle/wrapper-validation-action@v1
|
||||
- run: ./gradlew publish --no-daemon --stacktrace -PdemonwavUsername=paperweight
|
||||
- run: ./gradlew publish --no-daemon --stacktrace
|
||||
env:
|
||||
ORG_GRADLE_PROJECT_demonwavPassword: ${{ secrets.paperweightToken }}
|
||||
ORG_GRADLE_PROJECT_wavJfrogUsername: ${{ secrets.DEPLOY_USER }}
|
||||
ORG_GRADLE_PROJECT_wavJfrogPassword: ${{ secrets.DEPLOY_PASS }}
|
||||
|
|
|
@ -163,7 +163,7 @@ publishing {
|
|||
val url = "https://wav.jfrog.io/artifactory/repo/"
|
||||
maven(url) {
|
||||
credentials(PasswordCredentials::class)
|
||||
name = "demonwav"
|
||||
name = "wavJfrog"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -78,14 +78,18 @@ class PatchApplier(
|
|||
commitTime = git("log", "--format=%aD", "-n", "1", "HEAD").getText()
|
||||
}
|
||||
|
||||
fun clearCommit() {
|
||||
commitMessage = null
|
||||
commitAuthor = null
|
||||
commitTime = null
|
||||
}
|
||||
|
||||
fun commitChanges() {
|
||||
println("Committing remapped changes to $remappedBranch")
|
||||
val message = commitMessage ?: throw PaperweightException("commitMessage not set")
|
||||
val author = commitAuthor ?: throw PaperweightException("commitAuthor not set")
|
||||
val time = commitTime ?: throw PaperweightException("commitTime not set")
|
||||
commitMessage = null
|
||||
commitAuthor = null
|
||||
commitTime = null
|
||||
clearCommit()
|
||||
|
||||
git("add", ".").executeSilently()
|
||||
git("commit", "-m", message, "--author=$author", "--date=$time").execute()
|
||||
|
|
Loading…
Reference in a new issue