diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0443030..37c8398 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,10 +17,6 @@ name: 🚀 deploy on: workflow_dispatch: pull_request: - release: - types: - - published - - deleted push: branches: - main @@ -28,7 +24,6 @@ on: jobs: deploy: runs-on: ubuntu-22.04 - if: github.event.action != 'deleted' steps: - uses: actions/checkout@v2 with: @@ -61,28 +56,3 @@ jobs: - name: 🆙 Upload package to `libhal-trunk` repo if: startsWith(github.ref, 'refs/tags/') run: conan upload "libhal-cmake-util/*" --confirm -r=libhal-trunk - - revoke: - runs-on: ubuntu-22.04 - if: github.event.action == 'deleted' - steps: - - uses: actions/checkout@v2 - with: - submodules: true - fetch-depth: 0 - - - name: 📥 Install CMake & Conan - run: pip3 install cmake conan==2.0.9 - - - name: 📡 Add `libhal-trunk` conan remote - run: conan remote add libhal-trunk - https://libhal.jfrog.io/artifactory/api/conan/trunk-conan - - - name: 📡 Sign into JFrog Artifactory - env: - API_KEY: ${{ secrets.JFROG_LIBHAL_TRUNK_API_KEY }} - JFROG_USER: ${{ secrets.JFROG_LIBHAL_TRUNK_USER }} - run: conan remote login -p $API_KEY libhal $JFROG_USER - - - name: 🚮 Pulling package version ${{ github.ref_name }} from `libhal` - run: conan remove "libhal-cmake-util/${{ github.event.release.tag_name }}" --confirm -r=libhal diff --git a/cmake/build.cmake b/cmake/build.cmake index 402954d..39dfb2f 100644 --- a/cmake/build.cmake +++ b/cmake/build.cmake @@ -223,10 +223,15 @@ function(libhal_build_demos) if(NOT DEFINED ENV{LIBHAL_PLATFORM} OR NOT DEFINED ENV{LIBHAL_PLATFORM_LIBRARY}) message(FATAL_ERROR - "Both LIBHAL_PLATFORM and LIBHAL_PLATFORM_LIBRARY environment variables " - "must be defined. Make sure you are using the correct profile!") + "${LIBHAL_TITLE}: Both LIBHAL_PLATFORM and LIBHAL_PLATFORM_LIBRARY " + "environment variables must be defined. Make sure you are using the " + "correct profile!") endif() + message(STATUS "${LIBHAL_TITLE}: LIBHAL_PLATFORM = $ENV{LIBHAL_PLATFORM}") + message(STATUS "${LIBHAL_TITLE}: LIBHAL_PLATFORM_LIBRARY = " + "libhal-$ENV{LIBHAL_PLATFORM}") + find_package(libhal-$ENV{LIBHAL_PLATFORM_LIBRARY} REQUIRED) foreach(PACKAGE ${DEMO_ARGS_PACKAGES}) diff --git a/conanfile.py b/conanfile.py index a2a9b8c..16a529d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -23,7 +23,7 @@ class libhal_cmake_util_conan(ConanFile): name = "libhal-cmake-util" - version = "4.0.1" + version = "4.0.2" license = "Apache-2.0" url = "https://github.com/conan-io/conan-center-index" homepage = "https://libhal.github.io/libhal-armcortex"