starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-01-11 22:30:54 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Fix snapshot publishing (#1330)

Browse Source
This commit is contained in:
Islon Scherer
2025-11-26 09:17:14 +01:00
committed by GitHub
parent cc02b6b685
commit 6c3683c55e
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
.github/index.pkl vendored
View File

@@ -2,13 +2,13 @@ amends "@pkl.impl.ghactions/PklCI.pkl"
import "@gha/Workflow.pkl" import "@gha/Workflow.pkl"
import "jobs/BuildJavaExecutableJob.pkl"
import "jobs/BuildNativeJob.pkl" import "jobs/BuildNativeJob.pkl"
import "jobs/DeployJob.pkl" import "jobs/DeployJob.pkl"
import "jobs/GithubRelease.pkl" import "jobs/GithubRelease.pkl"
import "jobs/GradleJob.pkl" import "jobs/GradleJob.pkl"
import "jobs/PklJob.pkl" import "jobs/PklJob.pkl"
import "jobs/SimpleGradleJob.pkl" import "jobs/SimpleGradleJob.pkl"
import "jobs/BuildJavaExecutableJob.pkl"
triggerDocsBuild = "both" triggerDocsBuild = "both"
@@ -132,7 +132,10 @@ prb {
} }
} }
`if` = `if` =
tags.toList().map((it) -> "contains(github.event.pull_request.body, '\(it)')").join(" || ") tags
.toList()
.map((it) -> "contains(github.event.pull_request.body, '\(it)')")
.join(" || ")
} }
} }
} }
@@ -152,7 +155,14 @@ build {
main { main {
jobs = jobs =
(buildAndTestJobs) { (buildAndTestJobs) {
["deploy-snapshot"] = (new DeployJob { command = "publishToSonatype" }) { ["deploy-snapshot"] = (
new DeployJob {
extraGradleArgs {
"--no-parallel"
}
command = "publishToSonatype"
}
) {
needs = buildAndTestJobs.keys.toListing() needs = buildAndTestJobs.keys.toListing()
} }
} |> toWorkflowJobs } |> toWorkflowJobs
@@ -163,14 +173,15 @@ releaseBranch {
} }
release { release {
jobs = (releaseJobs) { jobs =
["deploy-release"] = ( (releaseJobs) {
new DeployJob { command = "publishToSonatype closeAndReleaseSonatypeStagingRepository" } ["deploy-release"] = (
) { new DeployJob { command = "publishToSonatype closeAndReleaseSonatypeStagingRepository" }
needs = releaseJobs.keys.toListing() ) {
} needs = releaseJobs.keys.toListing()
["github-release"] = (new GithubRelease {}) { }
needs = "deploy-release" ["github-release"] = (new GithubRelease {}) {
} needs = "deploy-release"
} |> toWorkflowJobs }
} |> toWorkflowJobs
} }

2
.github/workflows/main.yml generated vendored
View File

@@ -763,7 +763,7 @@ jobs:
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEPASSWORD }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEPASSWORD }}
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEUSERNAME }} ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEUSERNAME }}
run: ./gradlew --info --stacktrace -DpklMultiJdkTesting=true publishToSonatype run: ./gradlew --info --stacktrace -DpklMultiJdkTesting=true --no-parallel publishToSonatype
- name: Upload Test Result XML - name: Upload Test Result XML
if: '!cancelled()' if: '!cancelled()'
uses: actions/upload-artifact@v5 uses: actions/upload-artifact@v5