Merge branch '1.1' of https://github.com/mariadb-corporation/mariadb-connector-python into 1.1

Author: 9EOR9

.travis.yml

@@ -11,21 +11,30 @@ before_install:
   - git clone https://github.com/mariadb-corporation/connector-test-machine.git
 
 install:
+  - source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testp -l "$local"
   - export MAIN_PATH=`pwd`
   # install pyenv to test multiple python version
   - git clone https://github.com/pyenv/pyenv.git ~/.pyenv
   - export PYENV_ROOT="$HOME/.pyenv"
   - eval "$(pyenv init -)"
   - export PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
   # install c dependency
-  - sudo apt-get install software-properties-common
-  - sudo apt-get install -f libssl-dev libssl1.1
-  - sudo apt-get install -f
-  - git clone https://github.com/mariadb-corporation/mariadb-connector-c.git ~/.cc_3.1
-  - cd ~/.cc_3.1
+  - |-
+    if [ "$TRAVIS_OS_NAME" != "osx" ] ; then
+      sudo apt-get install software-properties-common
+      sudo apt-get install -f libssl-dev libssl1.1
+      sudo apt-get install -f
+    fi
+  - git clone https://github.com/mariadb-corporation/mariadb-connector-c.git ~/.cc_3
+  - cd ~/.cc_3
   - mkdir bld
   - cd bld
-  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+  - |-
+    if [ "$TRAVIS_OS_NAME" = "osx" ] ; then
+      cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_EXTERNAL_ZLIB:BOOL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1
+    else
+      cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+    fi
   - make -j4
   - sudo make install
   - export MARIADB_PLUGIN_DIR==`mariadb_config --plugindir`
@@ -39,12 +48,12 @@ install:
   - pyenv versions
   # install server
   - cd $MAIN_PATH
-  - source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testp -l "$local"
 
 env:
   global:
     - PYTHON_VER="3.10"
-
+    - HOMEBREW_NO_AUTO_UPDATE=1
+    - HOMEBREW_NO_INSTALL_CLEANUP=1
 
 jobs:
   fast_finish: true
@@ -77,6 +86,10 @@ jobs:
       env: srv=mysql v=5.7
     - if: type = push AND fork = false
       env: srv=mysql v=8.0
+    - env: srv=mariadb v=10.7 local=1 PYTHON_VER="3.10"
+      os: osx
+      osx_image: xcode13.3
+      compiler: gcc
 
 notifications:
   email: false