Skip to content

Commit 16bd82a

Browse files
committed
Merge pull request #113 from brodykenrick/master
Fix issue in travis missing Maven build failures and add platform [juno, kepler,...] in output archive names
2 parents 1b439f2 + 405ac29 commit 16bd82a

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

it.baeyens.arduino.parent/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,12 @@
333333

334334
<profile>
335335
<id>juno</id>
336+
<properties>
337+
<platform-version-name>juno</platform-version-name>
338+
</properties>
336339
<activation>
337340
<activeByDefault>true</activeByDefault>
338341
</activation>
339-
340342
<repositories>
341343
<repository>
342344
<id>platform_juno</id>
@@ -354,6 +356,9 @@
354356

355357
<profile>
356358
<id>kepler</id>
359+
<properties>
360+
<platform-version-name>kepler</platform-version-name>
361+
</properties>
357362
<repositories>
358363
<repository>
359364
<id>platform_kepler</id>
@@ -371,6 +376,9 @@
371376

372377
<profile>
373378
<id>luna</id>
379+
<properties>
380+
<platform-version-name>luna</platform-version-name>
381+
</properties>
374382
<repositories>
375383
<repository>
376384
<id>platform_luna</id>

it.baeyens.arduino.product/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
<product>
4545
<!-- id is verbatim to todo.product "uid" -->
4646
<id>it.baeyens.arduino.product</id>
47+
<!-- Customise the packaged product's archive name (Instead of "it.baeyens.arduino.product")
48+
Suffix is still <os>.<ws>.<arch>.<archiveExtension> (e.g. linux.gtk.x86_64.tar.gz)
49+
-->
50+
<archiveFileName>EclipseArduinoIDE-${platform-version-name}</archiveFileName>
4751
<!-- Causes the archives to contain a folder todo/ that contains the
4852
application -->
4953
<!-- Without it, the application is at the archive root -->

travis_exec_and_print_time.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
echo "Exec and print time periodically (overcoming our very long quiet times)"
3+
echo "Exec and print time periodically - overcoming long quiet times"
44
#Test command
55
#CMD="sleep 5"
66
#echo "CMD=$CMD"
@@ -15,13 +15,20 @@ PID=$!
1515
echo "Testing for PID=$PID"
1616

1717
#Sleep for X seconds and then test if the PID is still active
18-
# inefficient but not too bad for this use case
18+
# inefficient (only breaks in intervals of timer) but not too bad for this use case
1919
# also not safe from race conditions in general but fine here
20-
while sleep 180
21-
kill -0 $PID >/dev/null 2>&1
20+
while ps | grep " $PID " | grep -v grep > /dev/null 2>&1
2221
do
23-
echo "Still running at $SECONDS seconds"
22+
sleep 180
23+
echo "PID=$PID still running at $SECONDS seconds"
2424
done
2525

2626
echo "Ran for $SECONDS seconds"
2727

28+
#Wait will get the process even if it has already exited in this session
29+
#echo "Waiting on PID=$PID"
30+
wait $PID
31+
STATUS=$?
32+
echo "Exit status of $STATUS"
33+
exit $STATUS
34+

0 commit comments

Comments
 (0)