Update to macos-12 for github actions and fix platform name for x86_6…

…4 wheels (#138) * Use --plat-name for osx builds * Set macos deployment target to 10.9, set platform to 10.9-x86_64, use macos-12 runner * Remove osx easy_install command * Remove python2.7 build on macos * Remove python2.7 build on macos * Add DYLD_LIBRARY_PATH for net tests * Use macosx-10.9-x86_64 for python wheel platform
robotraconteur · Nov 22, 2023 · 114614f · 114614f
1 parent bcc5d29
commit 114614f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -395,7 +395,7 @@ jobs:
 
   build-osx:
 
-    runs-on: macos-11
+    runs-on: macos-12
     env:
       LIBRARY_PATH: /usr/local/opt/icu4c/lib
     steps:
@@ -407,15 +407,6 @@ jobs:
     - name: brew
       run: |
         brew install swig boost openssl googletest
-    - name: install pip
-      run: |
-        sudo /usr/bin/easy_install pip==19.3.1
-        sudo /usr/bin/python -m pip install --upgrade pip
-    - name: pip
-      run: |
-        /usr/bin/python -m pip install setuptools wheel pytest
-    - name: env python2
-      run: echo "PYTHON2_EXE=/usr/bin/python" >> $GITHUB_ENV
     - uses: actions/setup-python@v4
       id: python3
       with:
@@ -438,13 +429,14 @@ jobs:
         -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON" >> $GITHUB_ENV
     - name: configure
       run: >
-        cmake -G "Unix Makefiles" -DBUILD_GEN=ON  -DBUILD_TESTING=ON -DBUILD_PYTHON3=ON -DBUILD_PYTHON3_WHEEL=ON 
+        cmake -G "Unix Makefiles" -DBUILD_GEN=ON  -DBUILD_TESTING=ON -DBUILD_PYTHON3=ON -DBUILD_PYTHON3_WHEEL=OFF 
         -DBoost_USE_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=Release 
         -DBUILD_JAVA=ON -DBUILD_NET=ON -DPACKAGE_SWIG_SOURCE_ALL=ON 
-        -DBUILD_PYTHON=ON -DBUILD_PYTHON_WHEEL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
-        -DOPENSSL_USE_STATIC_LIBS=ON -DPYTHON_EXECUTABLE="${{ env.PYTHON2_EXE }}"
+        -DBUILD_PYTHON=OFF -DBUILD_PYTHON_WHEEL=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+        -DOPENSSL_USE_STATIC_LIBS=ON
         -DPYTHON3_EXECUTABLE="${{ steps.python3.outputs.python-path }}"
         -DROBOTRACONTEUR_VERSION_SEMVER="${{ env.ROBOTRACONTEUR_SEMVER }}"
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
         ${{ env.CMAKE_CACHE_ARGS }}
         -S robotraconteur -B build2
     - name: build
@@ -656,7 +648,7 @@ jobs:
         ctest . -C Release --output-on-failure
 
   build-conda-osx:
-    runs-on: macos-11
+    runs-on: macos-12
     defaults:
       run:
         shell: bash -l {0}
@@ -810,7 +802,7 @@ jobs:
         path: build2/*
         retention-days: 2
   build-ios:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
       with:

diff --git a/RobotRaconteurPython3/CMakeLists.txt b/RobotRaconteurPython3/CMakeLists.txt
@@ -122,6 +122,7 @@ if(BUILD_PYTHON3_WHEEL)
         "${PYTHON3_EXECUTABLE}"
         setup.py
         bdist_wheel
+        ${PYTHON3_WHEEL_EXTRA_ARGS}
         DEPENDS ${SWIG_MODULE_RobotRaconteurPython3_REAL_NAME})
     if(WIN32)
         set_target_properties(RobotRaconteurPython3_Wheel PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD_DEBUG TRUE)

diff --git a/test/net/CMakeLists.txt b/test/net/CMakeLists.txt
@@ -64,7 +64,7 @@ if(NOT RR_NET_BUILD_NATIVE_ONLY)
         find_program(MONO_EXECUTABLE mono)
         set(RR_NET_TEST_CMD "\"${CMAKE_COMMAND}\"")
         set(RR_NET_TEST_CMD_ARGS
-            "-E env LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${CMAKE_BINARY_DIR}/@OUT_DIR_NAME@/NET/Native\ ${MONO_EXECUTABLE} ${CMAKE_BINARY_DIR}/test/@OUT_DIR_NAME@/NET/RobotRaconteurNETTest.exe"
+            "-E env LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${CMAKE_BINARY_DIR}/@OUT_DIR_NAME@/NET/Native\ DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:${CMAKE_BINARY_DIR}/@OUT_DIR_NAME@/NET/Native\ ${MONO_EXECUTABLE} ${CMAKE_BINARY_DIR}/test/@OUT_DIR_NAME@/NET/RobotRaconteurNETTest.exe"
         )
     endif()
     rrconfiguretest(test_prog_net "${RR_NET_TEST_CMD}" "test_prog" NOCTEST ARGS "${RR_NET_TEST_CMD_ARGS}")

diff --git a/tools/actions/build_python_ver/osx/action.yml b/tools/actions/build_python_ver/osx/action.yml
@@ -29,10 +29,12 @@ runs:
       -DBUILD_PYTHON3=ON -DBUILD_PYTHON3_WHEEL=ON
       -DBUILD_TESTING=ON
       -DPYTHON3_EXECUTABLE="${{ steps.python3.outputs.python-path }}"
+      -DPYTHON3_WHEEL_EXTRA_ARGS="--plat-name=macosx-10.9-x86_64"
       -DROBOTRACONTEUR_VERSION_SEMVER="${{ env.ROBOTRACONTEUR_SEMVER }}"
       ${{ env.CMAKE_CACHE_ARGS }}
       -DCMAKE_BUILD_TYPE=Release
       -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+      -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9
       -S robotraconteur -B build2_python_${{ inputs.python_version }}
     shell: bash
   - name: build