This is an automated email from the ASF dual-hosted git repository.
szaszm 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 7f19f9f17 MINIFICPP-2893 Only upload conan packages from apache (CI)
(#2253)
7f19f9f17 is described below
commit 7f19f9f17f20d35aed7263ea4f0410ce3425d8a5
Author: Martin Zink <[email protected]>
AuthorDate: Wed Sep 2 18:53:05 2026 +0200
MINIFICPP-2893 Only upload conan packages from apache (CI) (#2253)
---
.github/workflows/ci.yml | 6 +++---
.github/workflows/create-release-artifacts.yml | 12 +++++-------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5891e029..ff2699044 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,7 +106,7 @@ jobs:
python main.py --noninteractive --skip-compiler-install
--cmake-options="-DCMAKE_C_FLAGS=${CPPFLAGS} ${CFLAGS}
-DCMAKE_CXX_FLAGS=${CPPFLAGS} ${CXXFLAGS}"
--minifi-options="${MACOS_MINIFI_OPTIONS}"
working-directory: bootstrap
- name: Upload conan packages
- if: always() && github.event_name == 'push' && github.ref ==
'refs/heads/main'
+ if: always() && github.event_name == 'push' && github.ref ==
'refs/heads/main' && github.repository == 'apache/nifi-minifi-cpp'
run: |
source venv/bin/activate && conan remote login nifi-conan && conan
upload "*" -r nifi-conan --confirm
working-directory: bootstrap
@@ -237,7 +237,7 @@ jobs:
python main.py --noninteractive --skip-compiler-install
--minifi-options="%WINDOWS_MINIFI_OPTIONS%"
--cmake-options="-DCMAKE_C_COMPILER_LAUNCHER=sccache
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
shell: cmd
- name: Upload conan packages
- if: always() && github.event_name == 'push' && github.ref ==
'refs/heads/main'
+ if: always() && github.event_name == 'push' && github.ref ==
'refs/heads/main' && github.repository == 'apache/nifi-minifi-cpp'
working-directory: bootstrap
run: |
venv\Scripts\activate && conan remote login nifi-conan && conan
upload "*" -r nifi-conan --confirm
@@ -359,7 +359,7 @@ jobs:
&& python main.py --noninteractive --skip-compiler-install
--cmake-options="-DSTRICT_GSL_CHECKS=AUDIT -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
--minifi-options="${UBUNTU_CLANG_MINIFI_OPTIONS}"
working-directory: bootstrap
- name: Upload conan packages
- if: always() && github.event_name == 'push' && github.ref ==
'refs/heads/main'
+ if: always() && github.event_name == 'push' && github.ref ==
'refs/heads/main' && github.repository == 'apache/nifi-minifi-cpp'
run: |
source venv/bin/activate && conan remote login nifi-conan && conan
upload "*" -r nifi-conan --confirm
working-directory: bootstrap
diff --git a/.github/workflows/create-release-artifacts.yml
b/.github/workflows/create-release-artifacts.yml
index ae94ed7e5..06e7bb9bf 100644
--- a/.github/workflows/create-release-artifacts.yml
+++ b/.github/workflows/create-release-artifacts.yml
@@ -8,7 +8,7 @@ on:
description: Enable Conan package manager usage
default: false
schedule:
- - cron: '0 1 * * 1'
+ - 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 \
-DDOCKER_USE_CONAN=${{ inputs.enable_conan && 'ON' || 'OFF' }}
-DDOCKER_NIFI_CONAN_USER=${{ secrets.CONAN_USERNAME }}
-DDOCKER_NIFI_CONAN_PASSWORD=${{ secrets.CONAN_ACCESS_TOKEN }}
@@ -24,10 +24,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- platform: [
- { arch: "x86_64", tar-artifact: "minifi-x86_64-tar", rpm-artifact:
"minifi-x86_64-rpm" },
- { arch: "aarch64", tar-artifact: "minifi-aarch64-tar", rpm-artifact:
"minifi-aarch64-rpm" }
- ]
+ platform: [ { arch: "x86_64", tar-artifact: "minifi-x86_64-tar",
rpm-artifact: "minifi-x86_64-rpm" },
+ { arch: "aarch64", tar-artifact: "minifi-aarch64-tar",
rpm-artifact: "minifi-aarch64-rpm" } ]
steps:
- id: checkout
@@ -81,7 +79,7 @@ jobs:
shell: powershell
- name: Copy conan compatibility.py
shell: powershell
- if: always() && ${{ inputs.enable_conan }}
+ if: always() && inputs.enable_conan
run: |
$compatDir = Join-Path $env:USERPROFILE
".conan2\extensions\plugins\compatibility"
New-Item -ItemType Directory -Force -Path $compatDir | Out-Null
@@ -93,7 +91,7 @@ jobs:
shell: cmd
working-directory: bootstrap
- name: Upload conan packages
- if: always() && ${{ inputs.enable_conan }}
+ if: always() && inputs.enable_conan && github.repository ==
'apache/nifi-minifi-cpp'
working-directory: bootstrap
run: |
venv\Scripts\activate && conan remote login nifi-conan && conan
upload "*" -r nifi-conan --confirm
