Skip to content

Commit

Permalink
Merge branch 'peer-config-utilities' of github.com-myrobotlab:MyRobot…
Browse files Browse the repository at this point in the history
…Lab/myrobotlab into inmoov-and-statemachine-1
  • Loading branch information
supertick committed Oct 22, 2023
2 parents 7a5ee0a + 2674733 commit 86eff22
Show file tree
Hide file tree
Showing 13 changed files with 279 additions and 103 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ jobs:

- name: Dependency Test
run: mvn test -Dtest=org.myrobotlab.framework.DependencyTest -q

- name: Build and Test with Maven
- name: Build with Maven
run: mvn --batch-mode -Dtest=!**/OpenCV* test -q

- name: Get next version
Expand Down
2 changes: 1 addition & 1 deletion make_web_dev.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ git clone https://github.com/MyRobotLab/myrobotlab.git
cd myrobotlab
git pull
git status
curl -LOJ http://build.myrobotlab.org:8080/job/myrobotlab/job/develop/lastSuccessfulBuild/artifact/target/myrobotlab.jar
curl -LOJ https://github.com/MyRobotLab/myrobotlab/releases/latest/download/myrobotlab.jar
java -jar myrobotlab.jar --install && java -jar myrobotlab.jar -s webgui WebGui python Python i01 InMoov2 intro Intro

3 changes: 3 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
# fast build
mvn -DskipTests package -o
# execute
mvn exec:java -Dexec.mainClass=org.myrobotlab.service.Runtime -Dexec.args="-s webgui WebGui intro Intro python Python"
# specific test
mvn test -Dtest="org.myrobotlab.service.WebGuiTest#postTest"
Expand Down
Loading

0 comments on commit 86eff22

Please sign in to comment.