Update workflows

.forgejo/workflows/commit.yml

@@ -1,8 +1,8 @@
-name: build-and-test
+name: "PRs & Pushes"
 
 on:
- - pull_request
   - push
+  - pull_request
 
 jobs:
   build:
@@ -22,7 +22,7 @@ jobs:
           restore-keys: |
             gradle-${{ runner.os }}-
       - name: Compile
-     run: ./gradlew --no-daemon jar javadocJar sourceJar
+        run: ./gradlew --no-daemon jar
       - name: Save Gradle cache
         uses: actions/cache/save@v4
         with:
@@ -32,30 +32,14 @@ jobs:
           key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             gradle-${{ runner.os }}-
-   - name: Upload library JARs
+      - name: Upload JARs
         uses: https://code.forgejo.org/forgejo/upload-artifact@v4
         with:
           name: jars-libraries
           path: |
             **/build/libs/*.jar
-        !**/build/libs/*-javadoc.jar
-        !**/build/libs/*-sources.jar
           if-no-files-found: error
-   - name: Upload API documentation JARs
+  build-apidoc:
-     uses: https://code.forgejo.org/forgejo/upload-artifact@v4
-     with:
-      name: jars-apidocs
-      path: |
-        **/build/libs/*-javadoc.jar
-      if-no-files-found: error
-   - name: Upload source JARs
-     uses: https://code.forgejo.org/forgejo/upload-artifact@v4
-     with:
-      name: jars-sources
-      path: |
-        **/build/libs/*-sources.jar
-      if-no-files-found: error
- generate-javadoc:
     runs-on: docker
     container:
       image: git.staropensource.de/infrastructure/actions-docker:java
@@ -71,8 +55,8 @@ jobs:
           key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             gradle-${{ runner.os }}-
-   - name: Generate javadoc
+      - name: Compile
-     run: ./gradlew --no-daemon javadoc javadocAll
+        run: ./gradlew --no-daemon dokkaHtml dokkaHtmlMultiModule dokkaHtmlJar dokkaJavadocJar
       - name: Save Gradle cache
         uses: actions/cache/save@v4
         with:
@@ -82,44 +66,12 @@ jobs:
           key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             gradle-${{ runner.os }}-
-   - name: Upload separate javadoc
+      - name: Upload JARs
         uses: https://code.forgejo.org/forgejo/upload-artifact@v4
         with:
-      name: javadoc-separate
+          name: jars-libraries
           path: |
-        **/build/docs/javadoc/*
+            build/dokka/htmlMultiModule
+            **/build/dokka/html
+            **/build/libs/*.jar
           if-no-files-found: error
-   - name: Upload combined javadoc
-     uses: https://code.forgejo.org/forgejo/upload-artifact@v4
-     with:  
-      name: javadoc-combined
-      path: |
-        build/docs/javadoc/*
-      if-no-files-found: error
- test:
-  runs-on: docker
-  container:
-   image: git.staropensource.de/infrastructure/actions-docker:java
-  steps:
-   - name: Checkout
-     uses: https://code.forgejo.org/actions/checkout@v4
-   - name: Restore Gradle cache
-     uses: actions/cache/restore@v4
-     with:   
-      path: |
-        ~/.gradle/caches 
-        ~/.gradle/wrapper      
-      key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      restore-keys: |
-        gradle-${{ runner.os }}-
-   - name: Run tests
-     run: ./gradlew --no-daemon test
-   - name: Save Gradle cache
-     uses: actions/cache/save@v4
-     with:
-      path: |
-        ~/.gradle/caches
-        ~/.gradle/wrapper
-      key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      restore-keys: |
-        gradle-${{ runner.os }}-

.forgejo/workflows/pullrequest.yml

@@ -1,60 +0,0 @@
-name: build-and-test
-
-on:
- - pull_request
-
-jobs:
- generate-javadoc:
-  runs-on: docker
-  container:
-   image: git.staropensource.de/infrastructure/actions-docker:java
-  steps:
-   - name: Checkout
-     uses: https://code.forgejo.org/actions/checkout@v4
-   - name: Restore Gradle cache
-     uses: actions/cache/restore@v4
-     with:
-      path: |
-        ~/.gradle/caches
-        ~/.gradle/wrapper
-      key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      restore-keys: |
-        gradle-${{ runner.os }}-
-   - name: Generate javadoc
-     run: ./gradlew --no-daemon javadoc
-   - name: Save Gradle cache
-     uses: actions/cache/save@v4
-     with:
-      path: |
-        ~/.gradle/caches
-        ~/.gradle/wrapper
-      key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      restore-keys: |
-        gradle-${{ runner.os }}-
- test:
-  runs-on: docker
-  container:
-   image: git.staropensource.de/infrastructure/actions-docker:java
-  steps:
-   - name: Checkout
-     uses: https://code.forgejo.org/actions/checkout@v4
-   - name: Restore Gradle cache
-     uses: actions/cache/restore@v4
-     with:
-      path: |
-        ~/.gradle/caches
-        ~/.gradle/wrapper
-      key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      restore-keys: |
-        gradle-${{ runner.os }}-
-   - name: Run tests
-     run: ./gradlew --no-daemon test
-   - name: Save Gradle cache
-     uses: actions/cache/save@v4
-     with:
-      path: |
-        ~/.gradle/caches
-        ~/.gradle/wrapper
-      key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-      restore-keys: |
-        gradle-${{ runner.os }}-