This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/workflows_update
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/feature/workflows_update by 
this push:
     new 1aa695f  Updates github workflows and minimizes travis config for 
coveralls and coverity
1aa695f is described below

commit 1aa695fedb3885a3324da5bc1351dd2fe2e0e3cb
Author: Pepijn Noltes <[email protected]>
AuthorDate: Mon Mar 30 20:08:07 2020 +0200

    Updates github workflows and minimizes travis config for coveralls and
    coverity
---
 .github/workflows/build.yml | 22 ++++++++++++++++++++--
 .travis.yml                 | 22 ----------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca60bd0..15f8ced 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,13 +8,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macOS-10.14]
+        os: []
         #os: [ubuntu-18.04, ubuntu-16.04, macOS-10.14]
-        compiler: [gcc, clang]
+        compiler: []
         include:
+          - os: macOS-10.14
+            name: OSX (10.14) clang
+            compiler: clang
           - os: ubuntu-18.04
+            name: Ubuntu Bionic (18) clang
+            compiler: clang
+          - os: ubuntu-18.04
+            name: Ubuntu Bionic (18) gcc (sanitizer)
             compiler: gcc
             sanitize: true
+          - os: ubuntu-18.04
+            name: Ubuntu Bionic (18) gcc (only v3 api)
+            compiler: gcc
+            v3_api: true
     timeout-minutes: 120
     steps:
     - name: Checkout source code
@@ -22,6 +33,7 @@ jobs:
     - name: Install dependencies
       run: |
         if [[ "${{ matrix.os }}" == "ubuntu"* ]]; then
+          sudo apt-get update
           sudo apt-get install -yq --no-install-recommends \
             build-essential \
             curl \
@@ -72,12 +84,18 @@ jobs:
           -DBUILD_RSA_DISCOVERY_SHM=OFF
         BUILD_OPTIONS_SANITIZE: |
           -DENABLE_ADDRESS_SANITIZER=ON
+        BUILD_OPTIONS_V3_API: |
+          -DCELIX_USE_ZIP_INSTEAD_OF_JAR=ON
+          -DCELIX_INSTALL_DEPRECATED_API=OFF
       run: |
         mkdir build install
         cd build
         if [[ "${{ matrix.sanitize }}" == "true" ]]; then
           export BUILD_OPTIONS="${BUILD_OPTIONS} ${BUILD_OPTIONS_SANITIZE}"
         fi
+        if [[ "${{ matrix.v3_api }}" == "true" ]]; then
+          export BUILD_OPTIONS="${BUILD_OPTIONS} ${BUILD_OPTIONS_V3_API}"
+        fi
         if [[ "${{ matrix.os }}" == "ubuntu"* ]]; then
           cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} 
${BUILD_OPTIONS_LINUX} \
               -DBUILD_FRAMEWORK_TESTS=ON \
diff --git a/.travis.yml b/.travis.yml
index 66d6ea3..a376768 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,28 +22,6 @@ matrix:
          dist: bionic
          compiler: gcc
          name: "Ubuntu Bionic (18) gcc"
-       - os: linux
-         dist: bionic
-         compiler: clang
-         name: "Ubuntu Bionic (18) clang"
-       - os: osx
-         osx_image: xcode10.2
-         compiler: clang
-         env: MACOSX_DEPLOYMENT_TARGET=10.14
-         name: "OSX (10.14) clang"
-       - os: linux
-         dist: bionic
-         compiler: gcc
-         env: SANITIZE=1
-         name: "Ubuntu Bionic (18) gcc; address sanitizer"
-       - os: linux
-         dist: bionic
-         compiler: gcc
-         env:
-           - USE_ZIP_INSTEAD_OF_JAR=1
-           - ONLY_V3_API=1
-         name: "Ubuntu Bionic (18) gcc; only v3 api"
-
 
 #DISABLED ANDROID BUILD
 #       - os: linux

Reply via email to