From 7a4acb84286e1966ea643a8552e2eba5762dc0da Mon Sep 17 00:00:00 2001 From: emilcode Date: Sun, 24 Aug 2025 13:50:46 +0000 Subject: [PATCH 1/4] [changed] Dockerfile changed to trigger pipeline --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 648c046..2395cbf 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -21,5 +21,5 @@ RUN apt-get update && \ ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 -# Install python packages +# Install needed python packages RUN pip3 install conan sphinx_rtd_theme breathe --break-system-packages \ No newline at end of file From 7ddc170aefa054aa44f27b8285e95d93031757cd Mon Sep 17 00:00:00 2001 From: emilcode Date: Sun, 24 Aug 2025 14:04:44 +0000 Subject: [PATCH 2/4] [added] profile for build set to detected default (system on which the build runs) --- .github/workflows/publish-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index fa235ff..7451219 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -45,6 +45,7 @@ jobs: - name: Create Conan package run: | + conan profile detect --force conan create . --version=${{ steps.vars.outputs.version }} --user=${{ github.actor }} --channel=stable - name: Upload Conan package From d2eb15ab1b30f04de229cc0aa8a2cb3848fa8832 Mon Sep 17 00:00:00 2001 From: emilcode Date: Sun, 24 Aug 2025 14:24:14 +0000 Subject: [PATCH 3/4] [changed] version of conan package set in env variable, can be used toset the version in pipeline with git tag --- .github/workflows/publish-package.yml | 4 +++- conanfile.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 7451219..fac606a 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -46,7 +46,9 @@ jobs: - name: Create Conan package run: | conan profile detect --force - conan create . --version=${{ steps.vars.outputs.version }} --user=${{ github.actor }} --channel=stable + conan create . --user=${{ github.repository_owner }} --channel=stable + env: + CONAN_REF_VERSION: ${{ steps.vars.outputs.version }} - name: Upload Conan package run: | diff --git a/conanfile.py b/conanfile.py index 0dc019d..f9193a9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,10 +1,11 @@ +import os from conan import ConanFile from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps class EmbeddedLibRecipe(ConanFile): name = "embeddedlib" - version = "0.1.0" + version = os.getenv("CONAN_REF_VERSION", "0.0.0") package_type = "library" # Optional metadata From e5a871308a124f42116b5f7bce0fc53eb7bf077e Mon Sep 17 00:00:00 2001 From: emilcode Date: Sun, 24 Aug 2025 14:31:04 +0000 Subject: [PATCH 4/4] [changed] start job only on push of tag or manually --- .github/workflows/publish-package.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index fac606a..39b4ce6 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -2,9 +2,8 @@ name: Conan Package on: push: - branches: [ main ] - tags: [ "v*" ] # Nur Tags, die mit v beginnen (z.B. v1.2.3) - pull_request: + tags: [ "v*" ] + workflow_dispatch: jobs: build-and-publish: @@ -19,9 +18,8 @@ jobs: steps: - uses: actions/checkout@v4 with: - fetch-depth: 0 # wichtig, damit Tags verfügbar sind + fetch-depth: 0 - # Version aus Git-Tag ableiten - name: Extract version from tag id: vars run: |