From 6a2d71164319de722c2ced7d7218dcf7406d95af Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Thu, 20 Jun 2024 22:42:26 +0200 Subject: [PATCH] New publishing style. --- .github/workflows/gradle.yml | 2 +- ....jdrupes.vmoperator.java-doc-conventions.gradle | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index afb5aab..f47366a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -28,4 +28,4 @@ jobs: java-version: '21' distribution: 'temurin' - name: Build with Gradle - run: ./gradlew -Prepo.access.token=${{ secrets.REPO_ACCESS_TOKEN }} stage + run: ./gradlew -Pwebsite.push.token=${{ secrets.WEBSITE_PUSH_TOKEN }} stage diff --git a/buildSrc/src/org.jdrupes.vmoperator.java-doc-conventions.gradle b/buildSrc/src/org.jdrupes.vmoperator.java-doc-conventions.gradle index 8e8413e..5eed550 100644 --- a/buildSrc/src/org.jdrupes.vmoperator.java-doc-conventions.gradle +++ b/buildSrc/src/org.jdrupes.vmoperator.java-doc-conventions.gradle @@ -116,20 +116,24 @@ task testJavadoc(type: Javadoc) { // Prepare github authentication for plugins if (System.properties['org.ajoberstar.grgit.auth.username'] == null) { System.setProperty('org.ajoberstar.grgit.auth.username', - project.rootProject.properties['repo.access.token'] ?: "nouser") + project.rootProject.properties['website.push.token'] ?: "nouser") } gitPublish { - repoUri = 'https://github.com/mnlipp/VM-Operator.git' - branch = 'gh-pages' + repoUri = 'https://github.com/mnlipp/jdrupes.org.git' + branch = 'main' contents { + from("${rootProject.projectDir}/webpages") { + include '_layouts/vm-operator.html' + include 'vm-operator/**' + } from("${rootProject.buildDir}/javadoc") { - into 'javadoc' + into 'vm-operator/javadoc' } if (!findProject(':org.jdrupes.vmoperator.runner.qemu').isSnapshot && !findProject(':org.jdrupes.vmoperator.manager').isSnapshot) { from("${rootProject.buildDir}/javadoc") { - into 'latest-release/javadoc' + into 'vm-operator/latest-release/javadoc' } } }