Skip to content

Commit

Permalink
pre release in build
Browse files Browse the repository at this point in the history
  • Loading branch information
supertick committed Oct 15, 2023
1 parent 0574c5c commit ef2e9d0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 11 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name: Java CI

#on: [push]

on:
push:

Expand All @@ -26,22 +24,33 @@ jobs:
run: mvn --batch-mode -Dtest=!**/OpenCV* test -q

- name: Get next version
if: github.ref == 'refs/heads/develop'
uses: reecetech/[email protected]
id: version
with:
scheme: semver
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
# run: |
# 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
Expand All @@ -53,3 +62,4 @@ jobs:
tag_name: ${{ steps.version.outputs.version }}
generate_release_notes: true
body_path: ./release-template.md

15 changes: 8 additions & 7 deletions src/main/java/org/myrobotlab/service/config/InMoov2Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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"));
Expand Down Expand Up @@ -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 + ".");

Expand Down

0 comments on commit ef2e9d0

Please sign in to comment.