You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2023/01/13 10:01:43 UTC
[celix] branch feature/update_github_actions created (now bc6b665f)
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a change to branch feature/update_github_actions
in repository https://gitbox.apache.org/repos/asf/celix.git
at bc6b665f Add issue nr to adjusted github ci config
This branch includes the following new commits:
new 3dcf4406 Update github actions to use conan and apt/brew
new 2870a970 Fix several small issues detected/needed in the github ci actions
new bc6b665f Add issue nr to adjusted github ci config
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[celix] 03/03: Add issue nr to adjusted github ci config
Posted by pn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/update_github_actions
in repository https://gitbox.apache.org/repos/asf/celix.git
commit bc6b665f1db833a4dc67afee6818f0345fe740b7
Author: Pepijn Noltes <pn...@apache.org>
AuthorDate: Fri Jan 13 11:01:08 2023 +0100
Add issue nr to adjusted github ci config
---
.github/workflows/macos.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 178cb837..f6991eb6 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
jobs:
build-conan:
- if: false #issues in pubsub tests, disable for now
+ if: false #See #471
runs-on: macOS-latest
timeout-minutes: 120
steps:
@@ -22,6 +22,7 @@ jobs:
env:
CONAN_BUILD_OPTIONS: |
-o celix:enable_testing=True
+ -o celix:enable_address_sanitizer=True
-o celix:build_all=True
run: |
#force reequire libcurl 7.64.1, due to a sha256 verify issue in libcurl/7.87.0
@@ -49,6 +50,7 @@ jobs:
brew install lcov zeromq czmq cpputest jansson rapidjson libzip
- name: Build
env:
+ #syslog disabled and Release not use because of #471
BUILD_OPTIONS: |
-DENABLE_TESTING=ON
-DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
[celix] 01/03: Update github actions to use conan and apt/brew
Posted by pn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/update_github_actions
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 3dcf44067b0eed515ad63c81870a3687ed8a2c75
Author: Pepijn Noltes <pn...@apache.org>
AuthorDate: Fri Jan 13 10:44:00 2023 +0100
Update github actions to use conan and apt/brew
---
.github/workflows/celix_etcdlib.yml | 18 +++----
.github/workflows/celix_promise.yml | 18 +++----
.github/workflows/coverage.yml | 67 ++++++++++---------------
.github/workflows/coverity-scan.yml | 17 +++++--
.github/workflows/macos-nightly.yml | 43 -----------------
.github/workflows/macos.yml | 94 +++++++++++++++++++++++-------------
.github/workflows/ubuntu-nightly.yml | 69 --------------------------
.github/workflows/ubuntu.yml | 93 ++++++++++++++++++++++++-----------
8 files changed, 174 insertions(+), 245 deletions(-)
diff --git a/.github/workflows/celix_etcdlib.yml b/.github/workflows/celix_etcdlib.yml
index 1abc53cd..a8a3b415 100644
--- a/.github/workflows/celix_etcdlib.yml
+++ b/.github/workflows/celix_etcdlib.yml
@@ -1,21 +1,18 @@
-name: Standalone Celix etcdlib Weekly
+name: Standalone Celix etcdlib
on:
+ push:
+ pull_request:
schedule:
- - cron: '0 0 * * 0'
+ - cron: '0 0 * * *'
jobs:
build:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-20.04]
- compiler: [gcc]
+ runs-on: ubuntu-20.04
timeout-minutes: 15
steps:
- name: Checkout source code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.3.0
- name: Install dependencies
run: |
sudo apt-get update
@@ -26,9 +23,6 @@ jobs:
libjansson-dev \
libcurl4-openssl-dev
- name: Build
- env:
- CC: ${{ matrix.compiler }}
- CXX: ${{ matrix.cxx_compiler }}
run: |
mkdir build install
cd build
diff --git a/.github/workflows/celix_promise.yml b/.github/workflows/celix_promise.yml
index 92dbd095..bcc2c109 100644
--- a/.github/workflows/celix_promise.yml
+++ b/.github/workflows/celix_promise.yml
@@ -1,21 +1,18 @@
-name: Standalone Celix Promise Weekly
+name: Standalone Celix Promise
on:
+ push:
+ pull_request:
schedule:
- - cron: '0 0 * * 0'
+ - cron: '0 0 * * *'
jobs:
build:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-20.04]
- compiler: [gcc]
+ runs-on: ubuntu-20.04
timeout-minutes: 15
steps:
- name: Checkout source code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.3.0
- name: Install dependencies
run: |
sudo apt-get update
@@ -23,9 +20,6 @@ jobs:
build-essential \
cmake
- name: Build
- env:
- CC: ${{ matrix.compiler }}
- CXX: ${{ matrix.cxx_compiler }}
run: |
mkdir build install
cd build
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 26295301..bda133df 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -4,46 +4,37 @@ on: [push, pull_request]
jobs:
coverage:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
+ timeout-minutes: 120
steps:
- name: Checkout source code
- uses: actions/checkout@v2
- - name: Install dependencies
+ uses: actions/checkout@v3.3.0
+ - name: Install conan and lcov
run: |
- sudo apt-get update
- sudo apt-get install -yq --no-install-recommends \
- build-essential \
- curl \
- uuid-dev \
- libjansson-dev \
- libcurl4-openssl-dev \
- default-jdk \
- cmake \
- libffi-dev \
- libxml2-dev \
- libczmq-dev \
- libcpputest-dev \
- rapidjson-dev \
- libzip-dev \
- lcov
- - name: Build
+ sudo apt-get install -yq --no-install-recommends lcov
+ sudo pip install conan
+ - name: Setup Conan Profile
+ run: |
+ conan profile new default --detect
+ conan profile update settings.build_type=Debug default
+ #Note no backwards compatiblity for gcc5 needed, setting libcxx to c++11.
+ conan profile update settings.compiler.libcxx=libstdc++11 default
+ - name: Install Dependencies
env:
- BUILD_OPTIONS: |
- -DENABLE_TESTING=ON
- -DENABLE_CODE_COVERAGE=ON
- -DBUILD_EXPERIMENTAL=ON
- -DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DENABLE_TESTING_FOR_CXX14=ON
+ CONAN_BUILD_OPTIONS: |
+ -o celix:enable_testing=True
+ -o celix:build_all=True
+ -o enable_code_coverage=True
run: |
- mkdir build
- cd build
- cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} ..
- make -j $(nproc)
- - name: Coverage
+ #force reequire libcurl 7.64.1, due to a sha256 verify issue in libcurl/7.87.0
+ conan install . celix/ci -pr:b default -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing --require-override=libcurl/7.64.1
+ - name: Build
run: |
- cd $GITHUB_WORKSPACE/build
- export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
+ conan build . -bf build --configure
+ conan build . -bf build --build
+ - name: Test with coverage
+ run: |
+ cd build
make coverage
lcx="lcov --output-file=coverage.info " && for i in `find . -name "*.info.cleaned"`; do lcx+=" --add-tracefile=$i"; done && $lcx
- name: Codecov
@@ -51,11 +42,3 @@ jobs:
with:
file: build/coverage.info
name: codecov-celix
-
-# NOTE For now disabled, need to be able to configure coveralls thresholds
-# See https://github.com/lemurheavy/coveralls-public/issues/1431
-# - name: Coveralls
-# uses: coverallsapp/github-action@master
-# with:
-# github-token: ${{ secrets.GITHUB_TOKEN }}
-# path-to-lcov: build/coverage.info
diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
index a159baa6..799800c6 100644
--- a/.github/workflows/coverity-scan.yml
+++ b/.github/workflows/coverity-scan.yml
@@ -1,5 +1,8 @@
-name: coverity-scan
+name: Celix Coverity Scan
+
on:
+ push:
+ pull_request:
schedule:
- cron: '0 0 * * 0' # Weekly at 00:00 UTC
@@ -8,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout source code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.3.0
- name: Install dependencies
run: |
sudo apt-get update
@@ -16,6 +19,7 @@ jobs:
build-essential \
curl \
uuid-dev \
+ libzip-dev \
libjansson-dev \
libcurl4-openssl-dev \
default-jdk \
@@ -25,7 +29,7 @@ jobs:
libczmq-dev \
libcpputest-dev \
rapidjson-dev \
- libzip-dev
+ libavahi-compat-libdnssd-dev
- name: Download Coverity Build Tool
run: |
mkdir -p build/cov-analysis-linux64
@@ -37,11 +41,14 @@ jobs:
- name: Build
env:
BUILD_OPTIONS: |
+ -DBUILD_EXPERIMENTAL=ON
-DENABLE_TESTING=ON
- -DCMAKE_BUILD_TYPE=Debug
- -DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
-DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
-DENABLE_TESTING_FOR_CXX14=ON
+ -DRSA_JSON_RPC=ON
+ -DRSA_SHM=ON
+ -DRSA_REMOTE_SERVICE_ADMIN_SHM_V2=ON
+ -DSHELL_BONJOUR=ON
run: |
cd build
cmake ${BUILD_OPTIONS} ..
diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml
deleted file mode 100644
index 56352880..00000000
--- a/.github/workflows/macos-nightly.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Celix MacOS Nightly
-
-on:
- schedule:
- - cron: '0 0 * * *'
-
-jobs:
- build:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os: [macOS-latest]
- compiler: [clang]
- timeout-minutes: 120
- steps:
- - name: Checkout source code
- uses: actions/checkout@v2
- - name: Install dependencies
- run: |
- brew update
- brew install lcov zeromq czmq openssl cpputest jansson rapidjson libzip
- brew unlink openssl && brew link openssl --force
- - name: Build
- env:
- CC: ${{ matrix.compiler }}
- BUILD_OPTIONS: |
- -DENABLE_TESTING=ON
- -DENABLE_ADDRESS_SANITIZER=ON
- -DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DENABLE_TESTING_FOR_CXX14=ON
- run: |
- mkdir build install
- cd build
- cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX=../install ..
- make -j && make install
- - name: Test
- run: |
- cd $GITHUB_WORKSPACE/build
- export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
- make test ARGS="-V"
-
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 0921585d..178cb837 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -3,39 +3,67 @@ name: Celix MacOS
on: [push, pull_request]
jobs:
- build:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- os: [macOS-latest]
- compiler: [clang]
+
+ build-conan:
+ if: false #issues in pubsub tests, disable for now
+ runs-on: macOS-latest
+ timeout-minutes: 120
+ steps:
+ - name: Checkout source code
+ uses: actions/checkout@v3.3.0
+ - name: Install conan
+ run: |
+ brew install conan
+ - name: Setup Conan Profile
+ run: |
+ conan profile new default --detect
+ conan profile update settings.build_type=Debug default
+ - name: Install Dependencies
+ env:
+ CONAN_BUILD_OPTIONS: |
+ -o celix:enable_testing=True
+ -o celix:build_all=True
+ run: |
+ #force reequire libcurl 7.64.1, due to a sha256 verify issue in libcurl/7.87.0
+ conan install . celix/ci -pr:b default -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing --require-override=libcurl/7.64.1
+ - name: Build
+ run: |
+ conan build . -bf build --configure
+ conan build . -bf build --build
+ - name: Test
+ run: |
+ cd build
+ source activate_run.sh
+ ctest --verbose
+ source deactivate_run.sh
+
+ build-brew:
+ runs-on: macOS-latest
timeout-minutes: 120
steps:
- - name: Checkout source code
- uses: actions/checkout@v2
- - name: Install dependencies
- run: |
- brew update
- brew install lcov zeromq czmq openssl cpputest jansson rapidjson libzip
- brew unlink openssl && brew link openssl --force
- - name: Build
- env:
- CC: ${{ matrix.compiler }}
- BUILD_OPTIONS: |
- -DENABLE_TESTING=ON
- -DENABLE_ADDRESS_SANITIZER=ON
- -DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DENABLE_TESTING_FOR_CXX14=ON
- run: |
- mkdir build install
- cd build
- cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX=../install ..
- make -j && make install
- - name: Test
- run: |
- cd $GITHUB_WORKSPACE/build
- export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
- make test ARGS="-V"
+ - name: Checkout source code
+ uses: actions/checkout@v3.3.0
+ - name: Install dependencies
+ run: |
+ brew update
+ brew install lcov zeromq czmq cpputest jansson rapidjson libzip
+ - name: Build
+ env:
+ BUILD_OPTIONS: |
+ -DENABLE_TESTING=ON
+ -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
+ -DENABLE_TESTING_FOR_CXX14=ON
+ -DENABLE_ADDRESS_SANITIZER=ON
+ -DCMAKE_BUILD_TYPE=Debug
+ -DBUILD_SYSLOG_WRITER=OFF
+ run: |
+ mkdir build install
+ cd build
+ cmake ${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX=../install ..
+ make -j && make install
+ - name: Test
+ run: |
+ cd $GITHUB_WORKSPACE/build
+ export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
+ make test ARGS="-V"
diff --git a/.github/workflows/ubuntu-nightly.yml b/.github/workflows/ubuntu-nightly.yml
deleted file mode 100644
index ae14baa1..00000000
--- a/.github/workflows/ubuntu-nightly.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-name: Celix Ubuntu Nightly
-
-on:
- schedule:
- - cron: '0 0 * * *'
-
-jobs:
- build:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- include:
- - os: ubuntu-20.04
- name: clang
- sanitizer: false #note sanitizer on clang with cpputest does not work
- compiler: clang
- cxx_compiler: clang++
- - os: ubuntu-20.04
- name: gcc
- sanitizer: true
- compiler: gcc
- cxx_compiler: g++
- timeout-minutes: 120
- steps:
- - name: Checkout source code
- uses: actions/checkout@v2
- - name: Install dependencies
- run: |
- sudo apt-get update
- sudo apt-get install -yq --no-install-recommends \
- build-essential \
- curl \
- uuid-dev \
- libjansson-dev \
- libcurl4-openssl-dev \
- default-jdk \
- cmake \
- libffi-dev \
- libxml2-dev \
- libczmq-dev \
- libcpputest-dev \
- rapidjson-dev \
- libzip-dev
- - name: Build
- env:
- CC: ${{ matrix.compiler }}
- CXX: ${{ matrix.cxx_compiler }}
- BUILD_OPTIONS: |
- -DENABLE_TESTING=ON
- -DBUILD_EXPERIMENTAL=ON
- -DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DENABLE_TESTING_FOR_CXX14=ON
- BUILD_OPTIONS_SANITIZER: |
- -DENABLE_ADDRESS_SANITIZER=ON
- run: |
- mkdir build install
- cd build
- if [[ "${{ matrix.sanitizer }}" == "true" ]]; then
- export BUILD_OPTIONS="${BUILD_OPTIONS} ${BUILD_OPTIONS_SANITIZER}"
- fi
- cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX=../install ..
- make -j $(nproc) && make install
- - name: Test
- run: |
- cd $GITHUB_WORKSPACE/build
- export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
- make test ARGS="-V"
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 614f7b1c..9fd7764f 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -1,30 +1,68 @@
name: Celix Ubuntu
-on: [push, pull_request]
+on:
+ push:
+ pull_request:
+ schedule:
+ - cron: '0 0 * * *'
jobs:
- build:
- runs-on: ${{ matrix.os }}
+
+ build-conan:
+ runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
- #os: [ubuntu-20.04]
- #compiler: [gcc, clang]
- include:
- - os: ubuntu-20.04
- name: clang
- sanitizer: false #note sanitizer on clang with cpputest does not work
- compiler: clang
- cxx_compiler: clang++
- - os: ubuntu-20.04
- name: gcc
- sanitizer: true
- compiler: gcc
- cxx_compiler: g++
+ compiler: [ [gcc,g++], [clang,clang++] ]
+ type: [ Debug ]
+ timeout-minutes: 120
+ steps:
+ - name: Checkout source code
+ uses: actions/checkout@v3.3.0
+ - name: Install conan
+ run: |
+ sudo pip install conan
+ - name: Setup Conan Profile
+ env:
+ CC: ${{ matrix.compiler[0] }}
+ CXX: ${{ matrix.compiler[1] }}
+ run: |
+ conan profile new default --detect
+ conan profile update settings.build_type=${{ matrix.type }} default
+ #Note no backwards compatiblity for gcc5 needed, setting libcxx to c++11.
+ conan profile update settings.compiler.libcxx=libstdc++11 default
+ conan profile show default
+ - name: Configure and install dependencies
+ env:
+ CC: ${{ matrix.compiler[0] }}
+ CXX: ${{ matrix.compiler[1] }}
+ CONAN_BUILD_OPTIONS: |
+ -o celix:enable_testing=True
+ -o celix:enable_address_sanitizer=True
+ -o celix:build_all=True
+ run: |
+ #force reequire libcurl 7.64.1, due to a sha256 verify issue in libcurl/7.87.0
+ conan install . celix/ci -pr:b default -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing --require-override=libcurl/7.64.1
+ - name: Build
+ env:
+ CC: ${{ matrix.compiler[0] }}
+ CXX: ${{ matrix.compiler[1] }}
+ run: |
+ conan build . -bf build --configure
+ conan build . -bf build --build
+ - name: Test
+ run: |
+ cd build
+ source activate_run.sh
+ ctest --verbose
+ source deactivate_run.sh
+
+ build-apt:
+ runs-on: ubuntu-20.04
timeout-minutes: 120
steps:
- name: Checkout source code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3.3.0
- name: Install dependencies
run: |
sudo apt-get update
@@ -32,6 +70,7 @@ jobs:
build-essential \
curl \
uuid-dev \
+ libzip-dev \
libjansson-dev \
libcurl4-openssl-dev \
default-jdk \
@@ -41,30 +80,26 @@ jobs:
libczmq-dev \
libcpputest-dev \
rapidjson-dev \
- libzip-dev
+ libavahi-compat-libdnssd-dev
- name: Build
env:
- CC: ${{ matrix.compiler }}
- CXX: ${{ matrix.cxx_compiler }}
BUILD_OPTIONS: |
- -DENABLE_TESTING=ON
-DBUILD_EXPERIMENTAL=ON
- -DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
+ -DENABLE_TESTING=ON
-DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
-DENABLE_TESTING_FOR_CXX14=ON
- BUILD_OPTIONS_SANITIZER: |
- -DENABLE_ADDRESS_SANITIZER=ON
+ -DRSA_JSON_RPC=ON
+ -DRSA_SHM=ON
+ -DRSA_REMOTE_SERVICE_ADMIN_SHM_V2=ON
+ -DSHELL_BONJOUR=ON
+ -DCMAKE_BUILD_TYPE=Release
run: |
mkdir build install
cd build
- if [[ "${{ matrix.sanitizer }}" == "true" ]]; then
- export BUILD_OPTIONS="${BUILD_OPTIONS} ${BUILD_OPTIONS_SANITIZER}"
- fi
- cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX=../install ..
+ cmake ${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX=../install ..
make -j $(nproc) && make install
- name: Test
run: |
cd $GITHUB_WORKSPACE/build
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
make test ARGS="-V"
-
[celix] 02/03: Fix several small issues detected/needed in the github ci actions
Posted by pn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/update_github_actions
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 2870a970917e61a53cae81c58a21be96253f4a34
Author: Pepijn Noltes <pn...@apache.org>
AuthorDate: Fri Jan 13 10:46:03 2023 +0100
Fix several small issues detected/needed in the github ci actions
---
.../discovery_configured/CMakeLists.txt | 6 ++++++
bundles/remote_services/discovery_shm/CMakeLists.txt | 4 +++-
.../remote_service_admin_shm_v2/CMakeLists.txt | 8 ++++++--
.../rsa_spi/include/export_registration.h | 11 ++++++++++-
.../rsa_spi/include/import_registration.h | 11 ++++++++++-
bundles/shell/shell_bonjour/private/src/bonjour_shell.c | 2 +-
conanfile.py | 16 +++++++++++++---
libs/dfi/src/dyn_common.c | 2 +-
libs/framework/src/celix_log.c | 2 +-
libs/utils/CMakeLists.txt | 2 +-
10 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt b/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt
index ea45b4ce..ec973790 100644
--- a/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt
+++ b/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt
@@ -39,6 +39,12 @@ target_link_libraries(RsaConfiguredDiscovery PRIVATE
Celix::rsa_spi
Celix::log_helper
)
+
+#Note import target RapidJSON::RapidJSO only created when using conan, else /usr/include is used.
+if (TARGET RapidJSON::RapidJSON)
+ target_link_libraries(RsaConfiguredDiscovery PRIVATE RapidJSON::RapidJSON)
+endif ()
+
target_include_directories(RsaConfiguredDiscovery PRIVATE src)
install_celix_bundle(RsaConfiguredDiscovery EXPORT celix COMPONENT rsa)
add_library(Celix::RsaConfiguredDiscovery ALIAS RsaConfiguredDiscovery)
diff --git a/bundles/remote_services/discovery_shm/CMakeLists.txt b/bundles/remote_services/discovery_shm/CMakeLists.txt
index eecadaff..7a2d9be1 100644
--- a/bundles/remote_services/discovery_shm/CMakeLists.txt
+++ b/bundles/remote_services/discovery_shm/CMakeLists.txt
@@ -37,7 +37,9 @@ target_include_directories(rsa_discovery_shm PRIVATE
$<TARGET_PROPERTY:Celix::rsa_discovery_common,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:Celix::civetweb,INCLUDE_DIRECTORIES>
)
-target_link_libraries(rsa_discovery_shm PRIVATE Celix::framework CURL::libcurl ${LIBXML2_LIBRARIES})
+target_link_libraries(rsa_discovery_shm PRIVATE
+ Celix::framework CURL::libcurl ${LIBXML2_LIBRARIES} Celix::log_helper
+ rsa_common)
install_celix_bundle(rsa_discovery_shm EXPORT celix COMPONENT rsa)
diff --git a/bundles/remote_services/remote_service_admin_shm_v2/CMakeLists.txt b/bundles/remote_services/remote_service_admin_shm_v2/CMakeLists.txt
index e62a07df..c475f3c4 100644
--- a/bundles/remote_services/remote_service_admin_shm_v2/CMakeLists.txt
+++ b/bundles/remote_services/remote_service_admin_shm_v2/CMakeLists.txt
@@ -15,8 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_REMOTE_SERVICE_ADMIN_SHM_V2 "Option to enable building the Remote Service Admin Service SHM V2 bundle" ON)
-if (RSA_REMOTE_SERVICE_ADMIN_SHM_V2 AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+set(RSA_REMOTE_SERVICE_ADMIN_SHM_V2_DEFAULT OFF)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ set(RSA_REMOTE_SERVICE_ADMIN_SHM_V2_DEFAULT ON)
+endif ()
+celix_subproject(RSA_REMOTE_SERVICE_ADMIN_SHM_V2 "Option to enable building the Remote Service Admin Service SHM V2 bundle" RSA_REMOTE_SERVICE_ADMIN_SHM_V2_DEFAULT)
+if (RSA_REMOTE_SERVICE_ADMIN_SHM_V2)
add_subdirectory(shm_pool)
add_subdirectory(rsa_shm)
diff --git a/bundles/remote_services/rsa_spi/include/export_registration.h b/bundles/remote_services/rsa_spi/include/export_registration.h
index 6aa95a99..f6ac78e0 100644
--- a/bundles/remote_services/rsa_spi/include/export_registration.h
+++ b/bundles/remote_services/rsa_spi/include/export_registration.h
@@ -24,8 +24,17 @@
#include "endpoint_description.h"
#include "service_reference.h"
-typedef struct export_registration export_registration_t;
+/**
+ * This headers contains a opaque declaration of the export_registration type and declaration of some generic
+ * exportRegistration functions. The export_registration type and the generic exportRegistration functions are used
+ * the common remote service parts.
+ *
+ * Service providers (i.e. RSA implementations) must provide the definition of type export_registration and can
+ * must implement the exportRegistration functions. Service providers can add additional exportRegistration functions,
+ * if needed.
+ */
+typedef struct export_registration export_registration_t;
typedef struct export_reference export_reference_t;
celix_status_t exportRegistration_close(export_registration_t *registration);
diff --git a/bundles/remote_services/rsa_spi/include/import_registration.h b/bundles/remote_services/rsa_spi/include/import_registration.h
index c51eeea1..0447729d 100644
--- a/bundles/remote_services/rsa_spi/include/import_registration.h
+++ b/bundles/remote_services/rsa_spi/include/import_registration.h
@@ -24,8 +24,17 @@
#include "endpoint_description.h"
#include "service_reference.h"
-typedef struct import_registration import_registration_t;
+/**
+ * This headers contains a opaque declaration of the import_registration type and declaration of some generic
+ * importRegistration functions. The import_registration type and the generic importRegistration functions are used
+ * the common remote service parts.
+ *
+ * Service providers (i.e. RSA implementations) must provide the definition of type import_registration and can
+ * must implement the importRegistration functions. Service providers can add additional importRegistration functions,
+ * if needed.
+ */
+typedef struct import_registration import_registration_t;
typedef struct import_reference import_reference_t;
celix_status_t importRegistration_getException(import_registration_t *registration);
diff --git a/bundles/shell/shell_bonjour/private/src/bonjour_shell.c b/bundles/shell/shell_bonjour/private/src/bonjour_shell.c
index 9e241ed6..8bceacf9 100644
--- a/bundles/shell/shell_bonjour/private/src/bonjour_shell.c
+++ b/bundles/shell/shell_bonjour/private/src/bonjour_shell.c
@@ -40,7 +40,7 @@
#include <stdbool.h>
#include <shell.h>
-#if defined(BSD) || defined(__APPLE__) || defined(ANDROID)
+#if CELIX_UTILS_NO_MEMSTREAM_AVAILABLE
#include "open_memstream.h"
#include "fmemopen.h"
#endif
diff --git a/conanfile.py b/conanfile.py
index 81b5dfe0..f1c05008 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -78,12 +78,13 @@ class CelixConan(ConanFile):
"build_launcher": [True, False],
"build_promises": [True, False],
"build_pushstreams": [True, False],
+ "build_experimental": [True, False],
"celix_cxx14": [True, False],
"celix_cxx17": [True, False],
"celix_install_deprecated_api": [True, False],
"celix_use_compression_for_bundle_zips": [True, False],
}
- default_options = {
+ default_options = {
"enable_testing": False,
"enable_code_coverage": False,
"enable_address_sanitizer": False,
@@ -124,8 +125,9 @@ class CelixConan(ConanFile):
"build_launcher": False,
"build_promises": False,
"build_pushstreams": False,
- "celix_cxx14": False,
- "celix_cxx17": False,
+ "build_experimental": False,
+ "celix_cxx14": True,
+ "celix_cxx17": True,
"celix_install_deprecated_api": False,
"celix_use_compression_for_bundle_zips": True,
}
@@ -229,6 +231,14 @@ class CelixConan(ConanFile):
self.requires("czmq/4.2.0")
self.options['czmq'].shared = True
+ #If czmq is needed, disable crypto for libzip to prevent openssl conflict:
+ # 'czmq/4.2.0' requires 'openssl/1.1.1m' while 'libcurl/7.86.0' requires 'openssl/1.1.1s'
+ self.options['libzip'].crypto = False
+
+ #If czmq is needed, disable ssl for libcurl to prevent openssl conflict:
+ # 'czmq/4.2.0' requires 'openssl/1.1.1m' while 'libcurl/7.87.0' requires 'openssl/1.1.1s'
+ self.options['libcurl'].with_ssl = False
+
def _configure_cmake(self):
if self._cmake:
return self._cmake
diff --git a/libs/dfi/src/dyn_common.c b/libs/dfi/src/dyn_common.c
index ff1b21ed..7180cf82 100644
--- a/libs/dfi/src/dyn_common.c
+++ b/libs/dfi/src/dyn_common.c
@@ -24,7 +24,7 @@
#include <ctype.h>
#include <stdbool.h>
-#if NO_MEMSTREAM_AVAILABLE
+#if CELIX_UTILS_NO_MEMSTREAM_AVAILABLE
#include "open_memstream.h"
#include "fmemopen.h"
#endif
diff --git a/libs/framework/src/celix_log.c b/libs/framework/src/celix_log.c
index 7cf34905..429d06e5 100644
--- a/libs/framework/src/celix_log.c
+++ b/libs/framework/src/celix_log.c
@@ -27,7 +27,7 @@
#include "celix_threads.h"
#include "celix_array_list.h"
-#ifdef NO_MEMSTREAM_AVAILABLE
+#ifdef CELIX_UTILS_NO_MEMSTREAM_AVAILABLE
#include "memstream/open_memstream.h"
#endif
diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt
index 51fa47ca..d1aa4bdc 100644
--- a/libs/utils/CMakeLists.txt
+++ b/libs/utils/CMakeLists.txt
@@ -49,7 +49,7 @@ set_target_properties(utils PROPERTIES OUTPUT_NAME "celix_utils")
target_link_libraries(utils PRIVATE libzip::libzip)
if (NOT OPEN_MEMSTREAM_EXISTS)
- target_compile_definitions(utils PUBLIC -DNO_MEMSTREAM_AVAILABLE)
+ target_compile_definitions(utils PUBLIC -DCELIX_UTILS_NO_MEMSTREAM_AVAILABLE)
endif ()
if (ANDROID)