Merge pull request #32 from HyperInspire/feature/ci

AdD auto-build ci
HyperInspire · May 7, 2024 · cd83d50 · cd83d50
2 parents 3f034b6 + 4441f3d
commit cd83d50
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 14 deletions.
diff --git a/.github/workflows/built_release_from_docker.yaml b/.github/workflows/built_release_from_docker.yaml
@@ -33,14 +33,16 @@ jobs:
 
       # Step 4: Build projects using Docker Compose
       - name: Build SDKs with Docker Compose
-        run: docker-compose up
+        run: |
+          docker-compose up
+          ls build
 
       # Step 5: Zip each SDK directory with the version number
       - name: Zip SDK Files
         run: |
-          zip -r inspireface-linux-armv7-armhf-${{ env.VERSION }}.zip build/inspireface-linux-armv7-armhf/
-          zip -r inspireface-linux-armv7-rv1109rv1126-armhf-${{ env.VERSION }}.zip build/inspireface-linux-armv7-rv1109rv1126-armhf/
-          zip -r inspireface-linux-x86-ubuntu18-${{ env.VERSION }}.zip build/inspireface-linux-x86-ubuntu18/
+          zip -r inspireface-linux-armv7-armhf-${{ env.VERSION }}.zip build/inspireface-linux-armv7-armhf-${{ env.VERSION }}/
+          zip -r inspireface-linux-armv7-rv1109rv1126-armhf-${{ env.VERSION }}.zip build/inspireface-linux-armv7-rv1109rv1126-armhf-${{ env.VERSION }}/
+          zip -r inspireface-linux-x86-ubuntu18-${{ env.VERSION }}.zip build/inspireface-linux-x86-ubuntu18-${{ env.VERSION }}/
 
       # Step 6: Upload the zipped SDK files for the next job
       - name: Upload SDK Artifacts

diff --git a/command/build.sh b/command/build.sh
@@ -23,6 +23,12 @@ move_install_files() {
     echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
 }
 
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
 # Detect the operating system
 OS_NAME=$(uname)
 BUILD_DIR="build"
@@ -34,32 +40,32 @@ SCRIPT_DIR=$(pwd)  # Project dir
 case "$OS_NAME" in
     Darwin)
         # macOS system
-        BUILD_DIR="${BUILD_DIR}/inspireface-macos"
+        BUILD_DIR="${BUILD_DIR}/inspireface-macos${TAG}"
         ;;
     Linux)
         # Linux system, further identify the distribution if necessary
         if [ -f /etc/os-release ]; then
             . /etc/os-release
             case "$ID" in
                 ubuntu)
-                    BUILD_DIR="${BUILD_DIR}/inspireface-linux-ubuntu"
+                    BUILD_DIR="${BUILD_DIR}/inspireface-linux-ubuntu${TAG}"
                     ;;
                 centos)
-                    BUILD_DIR="${BUILD_DIR}/inspireface-linux-centos"
+                    BUILD_DIR="${BUILD_DIR}/inspireface-linux-centos${TAG}"
                     ;;
                 *)
                     # If an unknown Linux distribution, default to generic 'linux'
-                    BUILD_DIR="${BUILD_DIR}/inspireface-linux"
+                    BUILD_DIR="${BUILD_DIR}/inspireface-linux${TAG}"
                     ;;
             esac
         else
             # If unable to detect Linux distribution, default to 'linux'
-            BUILD_DIR="${BUILD_DIR}/inspireface-linux"
+            BUILD_DIR="${BUILD_DIR}/inspireface-linux${TAG}"
         fi
         ;;
     *)
         # If OS is not recognized, default to 'generic'
-        BUILD_DIR="${BUILD_DIR}/inspireface-generic"
+        BUILD_DIR="${BUILD_DIR}/inspireface-generic${TAG}"
         ;;
 esac
 

diff --git a/command/build_cross_armv7_armhf.sh b/command/build_cross_armv7_armhf.sh
@@ -23,8 +23,14 @@ move_install_files() {
     echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
 }
 
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
 SCRIPT_DIR=$(pwd)  # Project dir
-BUILD_FOLDER_PATH="build/inspireface-linux-armv7-armhf"
+BUILD_FOLDER_PATH="build/inspireface-linux-armv7-armhf${TAG}"
 
 mkdir -p ${BUILD_FOLDER_PATH}
 # shellcheck disable=SC2164

diff --git a/command/build_cross_rv1109rv1126_armhf.sh b/command/build_cross_rv1109rv1126_armhf.sh
@@ -23,8 +23,14 @@ move_install_files() {
     echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
 }
 
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
 SCRIPT_DIR=$(pwd)  # Project dir
-BUILD_FOLDER_PATH="build/inspireface-linux-armv7-rv1109rv1126-armhf"
+BUILD_FOLDER_PATH="build/inspireface-linux-armv7-rv1109rv1126-armhf${TAG}"
 
 mkdir -p ${BUILD_FOLDER_PATH}
 # shellcheck disable=SC2164

diff --git a/command/build_linux_cuda.sh b/command/build_linux_cuda.sh
@@ -23,7 +23,13 @@ move_install_files() {
     echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
 }
 
-BUILD_FOLDER_PATH="build/inspireface-linux-cuda"
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
+BUILD_FOLDER_PATH="build/inspireface-linux-cuda${TAG}"
 SCRIPT_DIR=$(pwd)  # Project dir
 
 mkdir -p ${BUILD_FOLDER_PATH}

diff --git a/command/build_linux_ubuntu18.sh b/command/build_linux_ubuntu18.sh
@@ -23,7 +23,13 @@ move_install_files() {
     echo "Files from 'install' moved to $root_dir, and 'install' directory deleted."
 }
 
-BUILD_FOLDER_PATH="build/inspireface-linux-x86-ubuntu18/"
+if [ -n "$VERSION" ]; then
+    TAG="-$VERSION"
+else
+    TAG=""
+fi
+
+BUILD_FOLDER_PATH="build/inspireface-linux-x86-ubuntu18/${TAG}"
 SCRIPT_DIR=$(pwd)  # Project dir
 
 mkdir -p ${BUILD_FOLDER_PATH}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,6 +4,8 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile.ubuntu18  # Use the Ubuntu18.04
+    environment:
+      - VERSION=${VERSION}
     working_dir: /workspace
     volumes:
       - .:/workspace  # Mount the project root directory to the container
@@ -12,6 +14,8 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile.arm-linux-gnueabihf  # Use the arm-linux-gnueabihf tool chain
+    environment:
+      - VERSION=${VERSION}
     working_dir: /workspace
     volumes:
       - .:/workspace  # Mount the project root directory to the container
@@ -20,6 +24,8 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile.arm-linux-gnueabihf  # Use the arm-linux-gnueabihf tool chain
+    environment:
+      - VERSION=${VERSION}
     working_dir: /workspace
     volumes:
       - .:/workspace  # Mount the project root directory to the container