Merge branch 'testing' into develop

stlink-org · May 16, 2021 · f5ada94 · f5ada94
2 parents ebba0f3 + afad37c
commit f5ada94
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 4 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -22,9 +22,7 @@ elif [ "$TRAVIS_JOB_NAME" == "linux-mingw-32" ]; then
           -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && rm -rf build-mingw-32 && cd -
 
-elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    sudo apt-get update -qq || true
-
+elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
     echo "--> Building Debug..."
     mkdir -p build/Debug && cd build/Debug
     cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR

diff --git a/.travis.yml b/.travis.yml
@@ -26,8 +26,62 @@ jobs:
           packages:
             ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm", "mingw-w64"]
 
+    ### macOS ###
+
+    - os: osx
+      env: BADGE=osx
+      osx_image: xcode10.3
+      name: macOS 10.14.4 gcc
+      compiler: gcc
+      addons:
+        homebrew:
+          packages:
+            - gcc
+            - libusb
+            - gtk+3
+
+    - os: osx
+      env: BADGE=osx
+      osx_image: xcode10.3
+      name: macOS 10.14.4 gcc 32-bit
+      compiler: gcc
+      addons:
+        homebrew:
+          packages:
+            - gcc
+            - libusb
+            - gtk+3
+      before_install:
+        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+
+    - os: osx
+      env: BADGE=osx
+      osx_image: xcode10.3
+      name: macOS 10.14.4 clang
+      compiler: clang
+      addons:
+        homebrew:
+          packages:
+            - clang
+            - libusb
+            - gtk+3
+
+    - os: osx
+      env: BADGE=osx
+      osx_image: xcode10.3
+      name: macOS 10.14.4 clang 32-bit
+      compiler: gcc
+      addons:
+        homebrew:
+          packages:
+            - clang
+            - libusb
+            - gtk+3
+      before_install:
+        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+
 script:
   - git fetch --tags
   - printenv
   - cmake --version
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]] || [[ "$TRAVIS_OS_NAME" == "osx" ]];  then ./.travis.sh; fi