You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ad...@apache.org on 2021/10/05 07:43:33 UTC
[nifi-minifi-cpp] branch main updated (f5ff6e6 -> bffc89a)
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git.
from f5ff6e6 MINIFICPP-1655 Upgrade gsl-lite to version 0.39.0
new fd64bb7 MINIFICPP-1657 More efficient usage github cache storage
new bffc89a MINIFICPP-1653 Add SQL extension to Linux docker builds
The 2 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.
Summary of changes:
.github/workflows/ci.yml | 45 ++++++++++++++++++---------------------------
docker/bionic/Dockerfile | 2 +-
docker/centos/Dockerfile | 2 +-
docker/debian/Dockerfile | 2 +-
docker/fedora/Dockerfile | 2 +-
docker/focal/Dockerfile | 2 +-
6 files changed, 23 insertions(+), 32 deletions(-)
[nifi-minifi-cpp] 01/02: MINIFICPP-1657 More efficient usage github
cache storage
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit fd64bb7686f68431a27629d3b957474443a2c751
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Tue Oct 5 09:41:22 2021 +0200
MINIFICPP-1657 More efficient usage github cache storage
Signed-off-by: Adam Debreceni <ad...@apache.org>
This closes #1189
---
.github/workflows/ci.yml | 45 ++++++++++++++++++---------------------------
1 file changed, 18 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c321789..3d4a19e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,10 +15,9 @@ jobs:
uses: actions/cache@v2
with:
path: ${{ env.CCACHE_DIR }}
- key: macos-xcode12.0-ccache-${{github.ref}}-${{github.sha}}
+ key: macos-xcode12.0-ccache-${{github.ref}}
restore-keys: |
- macos-xcode12.0-ccache-${{github.ref}}-
- macos-xcode12.0-ccache-refs/heads/main-
+ macos-xcode12.0-ccache-
- id: install_dependencies
run: |
brew update
@@ -55,10 +54,9 @@ jobs:
uses: actions/cache@v2
with:
path: ${{ env.CLCACHE_DIR }}
- key: windows-vs2019-clcache-${{github.ref}}-${{github.sha}}
+ key: windows-vs2019-clcache-${{github.ref}}
restore-keys: |
- windows-vs2019-clcache-${{github.ref}}-
- windows-vs2019-clcache-refs/heads/main-
+ windows-vs2019-clcache-
- name: Setup PATH
uses: microsoft/setup-msbuild@v1.0.2
- id: install-sqliteodbc-driver
@@ -99,10 +97,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.ccache
- key: ubuntu-20.04-ccache-${{github.ref}}-${{github.sha}}
+ key: ubuntu-20.04-ccache-${{github.ref}}
restore-keys: |
- ubuntu-20.04-ccache-${{github.ref}}-
- ubuntu-20.04-ccache-refs/heads/main-
+ ubuntu-20.04-ccache-
- id: install_deps
run: |
sudo apt update
@@ -139,10 +136,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.ccache
- key: ubuntu-20.04-all-clang-ccache-${{github.ref}}-${{github.sha}}
+ key: ubuntu-20.04-all-clang-ccache-${{github.ref}}
restore-keys: |
- ubuntu-20.04-all-clang-ccache-${{github.ref}}-
- ubuntu-20.04-all-clang-ccache-refs/heads/main-
+ ubuntu-20.04-all-clang-ccache-
- id: install_deps
run: |
sudo apt update
@@ -170,10 +166,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.ccache
- key: debian-ccache-${{github.ref}}-${{github.sha}}
+ key: debian-ccache-${{github.ref}}
restore-keys: |
- debian-ccache-${{github.ref}}-
- debian-ccache-refs/heads/main-
+ debian-ccache-
- id: install_deps
run: |
sudo apt update
@@ -192,10 +187,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.ccache
- key: centos-ccache-${{github.ref}}-${{github.sha}}
+ key: centos-ccache-${{github.ref}}
restore-keys: |
- centos-ccache-${{github.ref}}-
- centos-ccache-refs/heads/main-
+ centos-ccache-
- id: install_deps
run: |
sudo apt update
@@ -214,10 +208,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.ccache
- key: fedora-ccache-${{github.ref}}-${{github.sha}}
+ key: fedora-ccache-${{github.ref}}
restore-keys: |
- fedora-ccache-${{github.ref}}-
- fedora-ccache-refs/heads/main-
+ fedora-ccache-
- id: install_deps
run: |
sudo apt update
@@ -236,10 +229,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.ccache
- key: ubuntu-18.04-ccache-${{github.ref}}-${{github.sha}}
+ key: ubuntu-18.04-ccache-${{github.ref}}
restore-keys: |
- ubuntu-18.04-ccache-${{github.ref}}-
- ubuntu-18.04-ccache-refs/heads/main
+ ubuntu-18.04-ccache-
- id: install_deps
run: |
sudo apt update
@@ -265,10 +257,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.ccache
- key: docker-ccache-${{github.ref}}-${{github.sha}}
+ key: docker-ccache-${{github.ref}}
restore-keys: |
- docker-ccache-${{github.ref}}-
- docker-ccache-refs/heads/main
+ docker-ccache-
- id: build
run: |
if [ -d ~/.ccache ]; then mv ~/.ccache .; fi
[nifi-minifi-cpp] 02/02: MINIFICPP-1653 Add SQL extension to Linux
docker builds
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit bffc89adcdc8ac89678ae2f034aaa96bc2ecbca9
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Tue Oct 5 09:42:44 2021 +0200
MINIFICPP-1653 Add SQL extension to Linux docker builds
Signed-off-by: Adam Debreceni <ad...@apache.org>
This closes #1184
---
docker/bionic/Dockerfile | 2 +-
docker/centos/Dockerfile | 2 +-
docker/debian/Dockerfile | 2 +-
docker/fedora/Dockerfile | 2 +-
docker/focal/Dockerfile | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index 9b210bf..b609cc5 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -44,5 +44,5 @@ ENV CXX g++-11
RUN cd $MINIFI_BASE_DIR \
&& ./bootstrap.sh -t \
&& cd $MINIFI_BASE_DIR/build \
- && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
+ && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DENABLE_SQL=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& make -j$(nproc) package
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index 6165e6e..63a1eff 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -38,6 +38,6 @@ ARG ENABLE_JNI
RUN cd $MINIFI_BASE_DIR \
&& ./bootstrap.sh -t \
&& cd build \
- && scl enable devtoolset-10 -- cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
+ && scl enable devtoolset-10 -- cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DENABLE_SQL=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& scl enable devtoolset-10 -- make -j$(nproc) package
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index 77c33be..c7d3639 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -44,5 +44,5 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
+ && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DENABLE_SQL=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& make -j$(nproc) package
diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
index 108507f..6c0c814 100644
--- a/docker/fedora/Dockerfile
+++ b/docker/fedora/Dockerfile
@@ -45,5 +45,5 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DFAIL_ON_WARNINGS=OFF -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
+ && cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DFAIL_ON_WARNINGS=OFF -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DENABLE_SQL=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& make -j$(nproc) package
diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile
index c44da2b..cc06702 100644
--- a/docker/focal/Dockerfile
+++ b/docker/focal/Dockerfile
@@ -45,5 +45,5 @@ ENV CXX g++-11
RUN cd $MINIFI_BASE_DIR \
&& ./bootstrap.sh -t \
&& cd $MINIFI_BASE_DIR/build \
- && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
+ && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DENABLE_SQL=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& make -j$(nproc) package