add build openssl, opencv for mac intel

cpvrlab · Jan 15, 2024 · 3ffdc91 · 3ffdc91
1 parent 36a987f
commit 3ffdc91
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 7 deletions.
diff --git a/.github/workflows/build-dep-g2o.yml b/.github/workflows/build-dep-g2o.yml
@@ -49,7 +49,7 @@ jobs:
 
     - name: Run build script arm
       working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
-      run: ./build_g2o_for_macArm64.sh
+      run: arch -arm64 ./build_g2o_for_macArm64.sh
 
     - name: Archive prebuilt g2o intel
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/build-dep-opencv.yml b/.github/workflows/build-dep-opencv.yml
@@ -23,7 +23,6 @@ jobs:
       with:
         name: prebuilt-opencv-windows
         path: ${{ github.workspace }}/externals/prebuild_scripts/win64_opencv_4.7.0
-
   build-linux:
     runs-on: ubuntu-22.04
 
@@ -39,3 +38,17 @@ jobs:
       with:
         name: prebuilt-opencv-linux
         path: ${{ github.workspace }}/externals/prebuilt/linux_opencv_4.7.0
+  build-macos:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run build script intel
+      working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
+      run: arch -x86_64 ./build_opencv_w_contrib_for_mac64.sh 4.7.0
+
+    - name: Archive prebuilt opencv intel
+      uses: actions/upload-artifact@v3
+      with:
+        name: prebuilt-opencv-mac64
+        path: ${{ github.workspace }}/externals/prebuilt/mac64_opencv_4.7.0
+
diff --git a/.github/workflows/build-dep-openssl.yml b/.github/workflows/build-dep-openssl.yml
@@ -0,0 +1,59 @@
+name: Build g2o
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - build-workflow
+
+jobs:
+  build-windows:
+    runs-on: windows-2022
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ilammy/msvc-dev-cmd@v1
+
+    - name: Run build script
+      working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
+      run: ./build_openssl_for_win64.bat
+
+    - name: Archive prebuilt g2o
+      uses: actions/upload-artifact@v3
+      with:
+        name: prebuilt-openssl-windows
+        path: ${{ github.workspace }}/externals/prebuilt/win64_openssl
+
+  build-linux:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Run build script
+      working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
+      run: ./build_openssl_for_linux.sh
+
+    - name: Archive prebuilt linux
+      uses: actions/upload-artifact@v3
+      with:
+        name: prebuilt-openssl-linux
+        path: ${{ github.workspace }}/externals/prebuilt/linux_openssl_1.1.1h
+  build-macos:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run build script intel
+      working-directory: ${{ github.workspace }}/externals/prebuild_scripts/
+      run: arch -x86_64 ./build_openssl_for_mac64_and_iosV8.sh
+
+    - name: Archive prebuilt openssl intel
+      uses: actions/upload-artifact@v3
+      with:
+        name: prebuilt-openssl-mac64
+        path: ${{ github.workspace }}/externals/prebuilt/mac64_openssl_1.1.1g
+
+    - name: Archive prebuilt openssl ios
+      uses: actions/upload-artifact@v3
+      with:
+        name: prebuilt-openssl-ios
+        path: ${{ github.workspace }}/externals/prebuilt/iosV8_openssl_1.1.1g
diff --git a/externals/prebuild_scripts/build_openssl_for_linux.sh b/externals/prebuild_scripts/build_openssl_for_linux.sh
@@ -5,14 +5,15 @@
 # ####################################################
 
 
+VERSION="1.1.1h"
 openssl_VERSION="OpenSSL_1_1_1h"
-if [ -n "$1" ]
-then
-    openssl_VERSION="$1"
-fi
+#if [ -n "$1" ]
+#then
+#    openssl_VERSION="$1"
+#fi
 
 ARCH=linux
-ZIPFILE=${ARCH}_openssl
+ZIPFILE=${ARCH}_openssl_${VERSION}
 
 clear
 echo "Building openssl Version: $openssl_VERSION"