Don't merge into jdrupes.org any more.

This commit is contained in:
Michael Lipp 2025-03-03 09:25:58 +01:00
parent 5c7a9f6e5f
commit c004265f5e
2 changed files with 1 additions and 39 deletions

View file

@ -19,7 +19,7 @@ allprojects {
}
task stage {
description = 'To be executed by CI, build and update JavaDoc.'
description = 'To be executed by CI.'
group = 'build'
// Build everything first
@ -27,13 +27,6 @@ task stage {
dependsOn subprojects.tasks.collect {
tc -> tc.findByName("build") }.flatten()
}
def gitBranch = grgit.branch.current.name.replace('/', '-')
if (JavaVersion.current() == JavaVersion.VERSION_21
&& gitBranch == "main") {
// Publish JavaDoc
dependsOn gitPublishPush
}
}
eclipse {

View file

@ -118,34 +118,3 @@ if (System.properties['org.ajoberstar.grgit.auth.username'] == null) {
System.setProperty('org.ajoberstar.grgit.auth.username',
project.rootProject.properties['website.push.token'] ?: "nouser")
}
gitPublish {
repoUri = 'https://github.com/mnlipp/jdrupes.org.git'
branch = 'main'
contents {
from("${rootProject.projectDir}/webpages") {
include '_includes/matomo-vm-operator.jdrupes.org.html'
include '_layouts/vm-operator.html'
include 'vm-operator/**'
}
from("${rootProject.buildDir}/javadoc") {
into 'vm-operator/javadoc'
}
if (!findProject(':org.jdrupes.vmoperator.runner.qemu').isSnapshot
&& !findProject(':org.jdrupes.vmoperator.manager').isSnapshot) {
from("${rootProject.buildDir}/javadoc") {
into 'vm-operator/latest-release/javadoc'
}
}
}
preserve { include '**/*' }
commitMessage = "Updated."
}
gradle.projectsEvaluated {
tasks.gitPublishReset.mustRunAfter subprojects.tasks
.collect { tc -> tc.findByName("build") }.flatten()
tasks.gitPublishReset.mustRunAfter subprojects.tasks
.collect { tc -> tc.findByName("test") }.flatten()
tasks.gitPublishCopy.dependsOn apidocs
}