Change to dependency handling for Group & EDHOC apps and Deploy Action

Signed-off-by: Rikard Höglund <[email protected]>

Author: rikard-sics

.github/workflows/deploy.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
 
+  # Build executable Jar files and package as a Release
   deploy:
 
     runs-on: ubuntu-latest
@@ -22,8 +23,8 @@ jobs:
 
       - name: Build Jar files and prepare dependencies for applications
         run: |
-          ./build-edhoc-apps.sh
           ./build-group-apps.sh
+          ./build-edhoc-apps.sh
    
       - name: Get version
         id: tagName

build-edhoc-apps.sh

@@ -15,6 +15,15 @@
 # Fail script with error if any command fails
 set -e
 
+# Separately install this dependency (if needed)
+FILE=~/.m2/repository/com/github/peteroupc/numbers/1.4.3/numbers-1.4.3.jar
+if [ -f "$FILE" ]; then
+    echo "$FILE exists."
+else 
+    echo "$FILE does not exist."
+    mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -Dartifact=com.github.peteroupc:numbers:1.4.3
+fi
+
 # Build Californium (if needed)
 FILE=californium-extended/cf-oscore/target/cf-oscore-3.1.0-SNAPSHOT.jar
 if [ -f "$FILE" ]; then

build-for-docker.sh

@@ -8,10 +8,6 @@ set -e
 
 ## Build the Jar files for the Group & EDHOC Applications if needed
 
-# Separately install these two dependencies
-mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -Dartifact=org.slf4j:jul-to-slf4j:1.7.36
-mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -Dartifact=org.slf4j:slf4j-simple:1.7.36
-
 # Group Applications
 FILE=group-applications/OscoreAsServer.jar
 if [ -f "$FILE" ]; then

build-group-apps.sh

@@ -9,6 +9,23 @@
 # Fail script with error if any command fails
 set -e
 
+# Separately install these two dependencies (if needed)
+FILE=~/.m2/repository/org/slf4j/jul-to-slf4j/1.7.36/jul-to-slf4j-1.7.36.jar
+if [ -f "$FILE" ]; then
+    echo "$FILE exists."
+else 
+    echo "$FILE does not exist."
+    mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -Dartifact=org.slf4j:jul-to-slf4j:1.7.36
+fi
+
+FILE=~/.m2/repository/org/slf4j/slf4j-simple/1.7.36/slf4j-simple-1.7.36.jar
+if [ -f "$FILE" ]; then
+    echo "$FILE exists."
+else 
+    echo "$FILE does not exist."
+    mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -Dartifact=org.slf4j:slf4j-simple:1.7.36
+fi
+
 # Build Californium (if needed)
 FILE=californium-extended/cf-oscore/target/cf-oscore-3.1.0-SNAPSHOT.jar
 if [ -f "$FILE" ]; then
@@ -50,9 +67,6 @@ cp californium-extended/scandium-core/target/scandium-3.1.0-SNAPSHOT.jar group-a
 
 cp californium-extended/element-connector/target/element-connector-3.1.0-SNAPSHOT.jar group-applications/lib
 
-#Remove?
-#cp californium-extended/cf-edhoc/target/cf-edhoc-3.1.0-SNAPSHOT.jar group-applications/lib
-
 cp ace/target/ace-0.0.1-SNAPSHOT.jar group-applications/lib
 
 # Run Group Apps JUnit tests