diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2d09bb420..0f580a8543 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,5 @@ name: Java CI -#on: [push] - on: push: @@ -26,7 +24,6 @@ jobs: run: mvn --batch-mode -Dtest=!**/OpenCV* test -q - name: Get next version - if: github.ref == 'refs/heads/develop' uses: reecetech/version-increment@2023.9.3 id: version with: @@ -34,7 +31,6 @@ jobs: increment: patch - name: Package with Maven - if: github.ref == 'refs/heads/develop' run: "mvn package -DskipTests -Dversion=${{ steps.version.outputs.version }} -q" # - name: Fake Build @@ -42,6 +38,19 @@ jobs: # mkdir -p target # echo ${{ github.sha }} > ./target/myrobotlab.zip + - name: Pre Release + if: github.ref != 'refs/heads/develop' + id: prerelease + uses: softprops/action-gh-release@v1 + with: + token: ${{ secrets.ACCESS_TOKEN }} + prerelease: true + files: ./target/myrobotlab.zip + name: "Pre ${{ steps.version.outputs.version }} Nixie" + tag_name: ${{ steps.version.outputs.version }} + generate_release_notes: true + body_path: ./release-template.md + - name: Release if: github.ref == 'refs/heads/develop' id: release @@ -53,3 +62,4 @@ jobs: tag_name: ${{ steps.version.outputs.version }} generate_release_notes: true body_path: ./release-template.md + diff --git a/src/main/java/org/myrobotlab/service/config/InMoov2Config.java b/src/main/java/org/myrobotlab/service/config/InMoov2Config.java index 6ff89b5629..3082aa2819 100644 --- a/src/main/java/org/myrobotlab/service/config/InMoov2Config.java +++ b/src/main/java/org/myrobotlab/service/config/InMoov2Config.java @@ -212,6 +212,7 @@ public Plan getDefault(Plan plan, String name) { } mouthControl.mouth = i01Name + ".mouth"; + ProgramABConfig chatBot = (ProgramABConfig) plan.get(getPeerName("chatBot")); Runtime runtime = Runtime.getInstance(); @@ -255,13 +256,6 @@ public Plan getDefault(Plan plan, String name) { mouth.voice = "Mark"; mouth.speechRecognizers = new String[] { name + ".ear" }; - // == Peer - servoMixer ============================= - // setup name references to different services - ServoMixerConfig servoMixer = (ServoMixerConfig) plan.get(getPeerName("servoMixer")); - servoMixer.listeners = new ArrayList<>(); - servoMixer.listeners.add(new Listener("publishText", name + ".mouth", "onText")); - //servoMixer.listeners.add(new Listener("publishText", name + ".chatBot", "onText")); - // == Peer - ear ============================= // setup name references to different services WebkitSpeechRecognitionConfig ear = (WebkitSpeechRecognitionConfig) plan.get(getPeerName("ear")); @@ -542,6 +536,13 @@ public Plan getDefault(Plan plan, String name) { listeners.add(new Listener("publishPlayAudioFile", getPeerName("audioPlayer"))); + // service --to--> service + ServoMixerConfig servoMixer = (ServoMixerConfig) plan.get(getPeerName("servoMixer")); + servoMixer.listeners = new ArrayList<>(); + servoMixer.listeners.add(new Listener("publishText", name + ".mouth", "onText")); + + + // remove the auto-added starts in the plan's runtime RuntimConfig.registry // plan.removeStartsWith(name + ".");