mi/werkator
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ads PR-triggered builds

Browse Source
This commit is contained in:
Michael Hoennig
2026-07-08 06:32:40 +02:00
parent 0e3f97db62
commit 0b17537b7c
7 changed files with 152 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/kotlin/de/hoennig/gittally/git/GitServiceTest.kt
+13
View File
@@ -113,6 +113,19 @@ class GitServiceTest : FunSpec() {
heads["feature/x"] shouldBe fixture.git(fixture.work, "rev-parse", "refs/remotes/origin/feature/x").stdout.trim()
}
test("pullRequestHeads returns the head commits of the remote's pull-request refs") {
val fixture = Fixture()
fixture.pushNewSeedBranch("feature/x")
service.pullRequestHeads(fixture.work) shouldBe emptySet()
// Gitea materializes a pull request as refs/pull/<n>/head on the served repository
fixture.git(fixture.seed, "push", "origin", "refs/heads/feature/x:refs/pull/1/head")
val featureHead = fixture.git(fixture.seed, "rev-parse", "refs/heads/feature/x").stdout.trim()
service.pullRequestHeads(fixture.work) shouldBe setOf(featureHead)
}
test("fetchOrigin picks up new origin branches and prunes deleted ones") {
val fixture = Fixture()
fixture.pushNewSeedBranch("feature/x")
src/test/kotlin/de/hoennig/gittally/watcher/WatcherTest.kt
+72
View File
@@ -72,6 +72,7 @@ class WatcherTest : FunSpec() {
every { gitService.newOriginBranches(any(), any()) } returns emptyList()
every { gitService.hasNewCommits(any(), any()) } returns false
every { gitService.originHeadCommit(any(), any()) } returns null
every { gitService.pullRequestHeads(any()) } returns emptySet()
every { gitService.worktreePrune(any()) } returns Unit
every { buildExecutor.currentBuilds() } returns emptyList()
every { buildExecutor.startBuild(any(), any(), any()) } answers {
@@ -230,6 +231,77 @@ class WatcherTest : FunSpec() {
verify { harness.gitService.newOriginBranches(Duration.ofHours(12), any()) }
}
test("a branch requiring a pull request is only built when its head matches a pull-request head") {
val harness = Harness(GitTallyConfig(branches = mapOf("default" to BranchConfig(requirePullRequest = true))))
every { harness.gitService.originBranches(any()) } returns listOf("feature/pr", "feature/no-pr")
every { harness.gitService.newOriginBranches(any(), any()) } returns listOf("feature/pr", "feature/no-pr")
every { harness.gitService.originHeadCommit("feature/pr", any()) } returns "commit-pr"
every { harness.gitService.originHeadCommit("feature/no-pr", any()) } returns "commit-solo"
every { harness.gitService.pullRequestHeads(any()) } returns setOf("commit-pr")
harness.watcher.poll(harness.workingDir)
harness.startedBuilds shouldContainExactly listOf("feature/pr" to "commit-pr")
}
test("pull-request refs are not queried when no due branch requires a pull request") {
val harness = Harness()
every { harness.gitService.originBranches(any()) } returns listOf("feature/x")
every { harness.gitService.newOriginBranches(any(), any()) } returns listOf("feature/x")
every { harness.gitService.originHeadCommit("feature/x", any()) } returns "commit-x"
harness.watcher.poll(harness.workingDir)
harness.startedBuilds shouldContainExactly listOf("feature/x" to "commit-x")
verify(exactly = 0) { harness.gitService.pullRequestHeads(any()) }
}
test("a branch entry overrides requirePullRequest from the default entry") {
val harness =
Harness(
GitTallyConfig(
branches =
mapOf(
"default" to BranchConfig(requirePullRequest = true),
"main" to BranchConfig(requirePullRequest = false),
),
),
)
every { harness.gitService.originBranches(any()) } returns listOf("main")
every { harness.gitService.localBranches(any()) } returns listOf("main")
every { harness.gitService.hasNewCommits("main", any()) } returns true
every { harness.gitService.originHeadCommit("main", any()) } returns "commit-main"
harness.watcher.poll(harness.workingDir)
harness.startedBuilds shouldContainExactly listOf("main" to "commit-main")
}
test("an auto build requiring a pull request is skipped and its slot stays untriggered") {
val harness =
Harness(
GitTallyConfig(
branches =
mapOf(
"default" to BranchConfig(),
"main" to
BranchConfig(
requirePullRequest = true,
autoBuild = AutoBuildConfig(enabled = true, times = listOf("11:00")),
),
),
),
)
harness.seed("main", BuildStatus.SUCCESS, commit = "commit-abc")
every { harness.gitService.originBranches(any()) } returns listOf("main")
every { harness.gitService.originHeadCommit("main", any()) } returns "commit-abc"
harness.watcher.poll(harness.workingDir)
harness.startedBuilds.shouldBeEmpty()
harness.autoBuildState().isTriggered("main", LocalDate.parse("2026-07-07"), "11:00").shouldBeFalse()
}
test("auto builds rebuild the already built commit once per day and slot") {
val harness = Harness(autoBuildConfig("01:00", "11:00", "13:00"))
harness.seed("main", BuildStatus.SUCCESS, commit = "commit-abc")