This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 8e3172929 MINIFICPP-2873 Add option to run create release artifacts
job with Conan (#2242)
8e3172929 is described below
commit 8e3172929410503644f3fa1089b9e259c6205e97
Author: Gabor Gyimesi <[email protected]>
AuthorDate: Tue Sep 1 12:10:11 2026 +0200
MINIFICPP-2873 Add option to run create release artifacts job with Conan
(#2242)
---
.github/workflows/create-release-artifacts.yml | 30 ++++++++++++++++++++++----
cmake/VerifyPackageWithDocker.cmake | 12 +++++------
2 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/create-release-artifacts.yml
b/.github/workflows/create-release-artifacts.yml
index cbf6ac7f3..ae94ed7e5 100644
--- a/.github/workflows/create-release-artifacts.yml
+++ b/.github/workflows/create-release-artifacts.yml
@@ -2,10 +2,18 @@ name: "Create Release Artifacts"
on:
workflow_dispatch:
+ inputs:
+ enable_conan:
+ type: boolean
+ description: Enable Conan package manager usage
+ default: false
schedule:
- cron: '0 1 * * 1'
env:
- CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Release -DCI_BUILD=OFF -DENABLE_ALL=ON
-DMINIFI_FAIL_ON_WARNINGS=OFF -DDOCKER_BUILD_ONLY=ON -DSKIP_TESTS=ON
+ CMAKE_FLAGS: -DCMAKE_BUILD_TYPE=Release -DCI_BUILD=OFF -DENABLE_ALL=ON
-DMINIFI_FAIL_ON_WARNINGS=OFF -DDOCKER_BUILD_ONLY=ON -DSKIP_TESTS=ON \
+ -DDOCKER_USE_CONAN=${{ inputs.enable_conan && 'ON' || 'OFF' }}
-DDOCKER_NIFI_CONAN_USER=${{ secrets.CONAN_USERNAME }}
-DDOCKER_NIFI_CONAN_PASSWORD=${{ secrets.CONAN_ACCESS_TOKEN }}
+ CONAN_LOGIN_USERNAME_NIFI_CONAN: ${{ secrets.CONAN_USERNAME }}
+ CONAN_PASSWORD_NIFI_CONAN: ${{ secrets.CONAN_ACCESS_TOKEN }}
jobs:
build-linux-artifacts:
@@ -71,11 +79,25 @@ jobs:
if ((Get-FileHash 'sqliteodbc_w64.exe').Hash -ne
"a4804e4f54f42c721df1323c5fcac101a8c7a577e7f20979227324ceab572d51") {Write
"Hash mismatch"; Exit 1}
Start-Process -FilePath ".\sqliteodbc_w64.exe" -ArgumentList "/S"
-Wait
shell: powershell
+ - name: Copy conan compatibility.py
+ shell: powershell
+ if: always() && ${{ inputs.enable_conan }}
+ run: |
+ $compatDir = Join-Path $env:USERPROFILE
".conan2\extensions\plugins\compatibility"
+ New-Item -ItemType Directory -Force -Path $compatDir | Out-Null
+ Copy-Item ".github\conan\compatibility.py" (Join-Path $compatDir
"compatibility.py")
- name: build
run: |
- python -m venv venv && venv\Scripts\activate && pip install -r
requirements.txt && python main.py --noninteractive --skip-compiler-install
--minifi-options="-DCMAKE_BUILD_TYPE=Release -DCI_BUILD=OFF -DENABLE_ALL=ON
-DMINIFI_FAIL_ON_WARNINGS=OFF -DSKIP_TESTS=ON"
+ python -m venv venv && venv\Scripts\activate && pip install -r
requirements.txt && ^
+ python main.py --noninteractive --skip-compiler-install
--minifi-options="-DCMAKE_BUILD_TYPE=Release -DCI_BUILD=OFF -DENABLE_ALL=ON
-DMINIFI_FAIL_ON_WARNINGS=OFF -DSKIP_TESTS=ON -DUSE_CONAN=${{
inputs.enable_conan && 'ON' || 'OFF' }}"
shell: cmd
working-directory: bootstrap
+ - name: Upload conan packages
+ if: always() && ${{ inputs.enable_conan }}
+ working-directory: bootstrap
+ run: |
+ venv\Scripts\activate && conan remote login nifi-conan && conan
upload "*" -r nifi-conan --confirm
+ shell: cmd
- name: Upload artifact
uses: actions/upload-artifact@v7
with:
@@ -103,11 +125,11 @@ jobs:
- name: Bundle SDK Artifacts into ZIP
run: |
mkdir minifi-native-sdk
-
+
cp behave_framework/dist/*.whl minifi-native-sdk/
cp minifi-api/minifi-api.def minifi-native-sdk/
cp minifi-api/include/minifi-api.h minifi-native-sdk/
-
+
zip -r minifi-native-sdk.zip minifi-native-sdk/
- name: Upload artifact
diff --git a/cmake/VerifyPackageWithDocker.cmake
b/cmake/VerifyPackageWithDocker.cmake
index 4af545c82..c00d0d771 100644
--- a/cmake/VerifyPackageWithDocker.cmake
+++ b/cmake/VerifyPackageWithDocker.cmake
@@ -39,17 +39,17 @@ function(ADD_PACKAGE_VERIFY TAG_PREFIX)
endfunction()
-CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux:8 rocky8 "dnf install -y
wget python3.12-devel python3.12-pip gcc gcc-c++ findutils")
-CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux:9 rocky9 "dnf install -y
wget python3-devel python3-pip gcc gcc-c++ findutils")
-CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux/rockylinux:10 rocky10 "dnf
install -y wget python3-devel python3-pip gcc gcc-c++ findutils")
+CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux:8 rocky8 "dnf install -y
wget python3.12-devel python3.12-pip gcc gcc-c++ findutils libatomic")
+CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux:9 rocky9 "dnf install -y
wget python3-devel python3-pip gcc gcc-c++ findutils libatomic")
+CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(rockylinux/rockylinux:10 rocky10 "dnf
install -y wget python3-devel python3-pip gcc gcc-c++ findutils libatomic")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(ubuntu:jammy jammy "apt update \\&\\&
apt install -y wget python3-dev python3-venv python3-pip")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(ubuntu:noble noble "apt update \\&\\&
apt install -y wget python3-dev python3-venv python3-pip")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(debian:bookworm bookworm "apt update
\\&\\& apt install -y wget python3-dev python3-venv python3-pip")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(debian:bullseye bullseye "apt update
\\&\\& apt install -y wget python3-dev python3-venv python3-pip")
CREATE_DOCKER_TARGET_FROM_ROCKY_PACKAGE(debian:trixie trixie "apt update
\\&\\& apt install -y wget python3-dev python3-venv python3-pip")
-CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux:8 rocky8 "dnf install -y wget
python3.12-devel python3.12-pip gcc gcc-c++")
-CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux:9 rocky9 "dnf install -y wget
python3-devel python3-pip gcc gcc-c++")
-CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux/rockylinux:10 rocky10 "dnf
install -y wget python3-devel python3-pip gcc gcc-c++")
+CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux:8 rocky8 "dnf install -y wget
python3.12-devel python3.12-pip gcc gcc-c++ libatomic")
+CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux:9 rocky9 "dnf install -y wget
python3-devel python3-pip gcc gcc-c++ libatomic")
+CREATE_DOCKER_TARGET_FROM_RPM_PACKAGE(rockylinux/rockylinux:10 rocky10 "dnf
install -y wget python3-devel python3-pip gcc gcc-c++ libatomic")
ADD_PACKAGE_VERIFY(rocky8)
ADD_PACKAGE_VERIFY(rocky9)
