Merge branch 'develop' into fix/470-git-user-config-in-build-and-release

Author: leandrumartin

.github/workflows/asciidoc-build.yml

@@ -3,25 +3,26 @@ name: build adocs
 on:
   push:
     branches:
-    - main
-    - develop
+      - develop
+  pull_request:
+    branches:
+      - main
+      - develop
+  workflow_call:
 
 jobs:
   adoc_build:
     runs-on: ubuntu-latest
     name: ASCII DOC build
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Get build container
-      id: adocbuild
-      uses: tonynv/asciidoctor-action@master
-      with:
-          program: "./gradlew asciidoctor"
-    - name: Deploy docs to ghpages
-      uses: peaceiris/actions-gh-pages@v3
-      with: 
-        deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-        publish_branch: gh-pages
-        publish_dir: ./pi4micronaut-utils/build/docs/asciidoc/
-
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Get build container
+        uses: tonynv/asciidoctor-action@v2
+        with:
+            program: "./gradlew asciidoctor"
+      - name: Upload AsciiDoc output
+        uses: actions/upload-artifact@v4
+        with:
+          name: asciidoc-output
+          path: pi4micronaut-utils/build/docs/asciidoc/

.github/workflows/asciidoc-publish.yml

@@ -0,0 +1,31 @@
+name: Publish AsciiDoc
+permissions:
+  contents: read
+on:
+  workflow_call:
+    secrets:
+      ACTIONS_DEPLOY_KEY:
+        required: true
+
+jobs:
+  build:
+    uses: ./.github/workflows/asciidoc-build.yml
+  adoc_publish:
+    needs: build
+    runs-on: ubuntu-latest
+    name: ASCII DOC publish
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Download AsciiDoc output
+        uses: actions/download-artifact@v4
+        with:
+          name: asciidoc-output
+          path: pi4micronaut-utils/build/docs/asciidoc/
+      - name: Deploy docs to ghpages
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          publish_branch: gh-pages
+          publish_dir: ./pi4micronaut-utils/build/docs/asciidoc/
+          keep_files: true

.github/workflows/javadoc-gh-pages.yml

@@ -4,10 +4,7 @@ permissions:
   pages: write
   id-token: write
 on:
-  push:
-    branches:
-      - main
-      - develop
+  workflow_call:
 
 jobs:
   build:
@@ -43,14 +40,12 @@ jobs:
         with:
           name: javadoc
           path: ./javadoc
-          retention-days: 1
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v4
-        if: github.ref == 'refs/heads/develop'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./javadoc
           destination_dir: javadoc
           keep_files: true
           user_name: 'github-actions[bot]'
-          user_email: 'github-actions[bot]@users.noreply.github.com'
+          user_email: 'github-actions[bot]@users.noreply.github.com'

.github/workflows/publish-docs.yml

@@ -0,0 +1,17 @@
+name: Publish Documentation
+permissions:
+  contents: write
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  publish-asciidoc:
+    uses: ./.github/workflows/asciidoc-publish.yml
+    secrets:
+      ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+
+  publish-javadoc:
+    needs: publish-asciidoc
+    uses: ./.github/workflows/javadoc-gh-pages.yml

components/src/main/java/com/opensourcewithslu/components/controllers/PassiveBuzzerController.java

@@ -5,10 +5,13 @@
 import io.micronaut.http.annotation.*;
 import jakarta.inject.Named;
 import java.io.File;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 //tag::ex[]
 @Controller("/passive-buzzer")
 public class PassiveBuzzerController {
+    private static final Logger log = LoggerFactory.getLogger(PassiveBuzzerController.class);
     private final PassiveBuzzerHelper passiveBuzzerHelper;
 
     protected int passBuzzFreq = 440;
@@ -44,9 +47,7 @@ public void disablePassiveBuzzer(){
      */
     @Get("/showFreq")
     public void passiveBuzzerFreq(){
-
-        passiveBuzzerHelper.getFrequency();
-
+        log.info(String.valueOf(passiveBuzzerHelper.getFrequency()));
     }
 
     /**

pi4micronaut-utils/build.gradle

@@ -41,11 +41,11 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    testImplementation("org.mockito:mockito-core:5.+")
+    testImplementation("org.mockito:mockito-core:5.18.0")
     testImplementation(platform("org.junit:junit-bom:5.11.0"))
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
-
+    testImplementation("org.mockito:mockito-junit-jupiter:5.18.0")
 }
 
 application {

pi4micronaut-utils/src/docs/asciidoc/components/outputComponents/fan.adoc

@@ -36,7 +36,7 @@ image::fanCircuit.png[]
 
 ===== Schematic Diagram
 
-image::fanSchmetic.png[]
+image::fanSchematic.png[]
 
 ===== YAML Configuration