Improve CircleCI builds (#294)

* Prevent build_artifacts.txt files from being published as
  GitHub releases
* Bump version to 1.0.2; make PRBs not depend on flakey pr-approval job
This commit is contained in:
Daniel Chao
2024-03-06 09:25:40 -08:00
committed by Dan Chao
parent 3421a97478
commit 1452dc5af3
2 changed files with 7 additions and 10 deletions

View File

@@ -14,7 +14,7 @@
// limitations under the License. // limitations under the License.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// File gets rendered to .circleci/config.yml via git hook. // File gets rendered to .circleci/config.yml via git hook.
amends "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.circleci@1.0.1#/PklCI.pkl" amends "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.circleci@1.0.2#/PklCI.pkl"
import "jobs/BuildNativeJob.pkl" import "jobs/BuildNativeJob.pkl"
import "jobs/GradleCheckJob.pkl" import "jobs/GradleCheckJob.pkl"
@@ -124,24 +124,22 @@ jobs {
:pkl-gradle:compatibilityTestCandidate :pkl-gradle:compatibilityTestCandidate
"""# """#
}.job }.job
["deploy-snapshot"] = new DeployJob { ["deploy-snapshot"] = new DeployJob { command = "publishToSonatype" }.job
command = "publishToSonatype"
}.job
["deploy-release"] = new DeployJob { ["deploy-release"] = new DeployJob {
isRelease = true isRelease = true
command = "publishToSonatype closeAndReleaseSonatypeStagingRepository" command = "publishToSonatype closeAndReleaseSonatypeStagingRepository"
}.job }.job
["github-release"] { ["github-release"] {
docker { docker {
new { new { image = "maniator/gh:v2.40.1" }
image = "maniator/gh:v2.40.1"
}
} }
steps { steps {
new AttachWorkspaceStep { at = "." } new AttachWorkspaceStep { at = "." }
new RunStep { new RunStep {
name = "Publish release on GitHub" name = "Publish release on GitHub"
command = #""" command = #"""
# exclude build_artifacts.txt from publish
rm pkl-cli/build/executable/*.build_artifacts.txt
gh release create "${CIRCLE_TAG}" \ gh release create "${CIRCLE_TAG}" \
--title "${CIRCLE_TAG}" \ --title "${CIRCLE_TAG}" \
--target "${CIRCLE_SHA1}" \ --target "${CIRCLE_SHA1}" \

View File

@@ -698,6 +698,8 @@ jobs:
at: '.' at: '.'
- run: - run:
command: |- command: |-
# exclude build_artifacts.txt from publish
rm pkl-cli/build/executable/*.build_artifacts.txt
gh release create "${CIRCLE_TAG}" \ gh release create "${CIRCLE_TAG}" \
--title "${CIRCLE_TAG}" \ --title "${CIRCLE_TAG}" \
--target "${CIRCLE_SHA1}" \ --target "${CIRCLE_SHA1}" \
@@ -751,15 +753,12 @@ workflows:
- gradle-check-jdk11: - gradle-check-jdk11:
requires: requires:
- hold - hold
- pr-approval/authenticate
- gradle-check-jdk17: - gradle-check-jdk17:
requires: requires:
- hold - hold
- pr-approval/authenticate
- check-patch-file: - check-patch-file:
requires: requires:
- hold - hold
- pr-approval/authenticate
when: when:
matches: matches:
value: << pipeline.git.branch >> value: << pipeline.git.branch >>