diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index cec0ea9..c033357 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -34,6 +34,10 @@ jobs: runs-on: ubuntu-latest env: CONAN_REVISIONS_ENABLED: 1 + # the path of the conanfile.py + PACKAGE_RECIPE_PATH: ${{ github.event.inputs.package | trim }}/${{ github.event.inputs.conanfile_path | trim }} + # the package reference + PACKAGE_REF: ${{ github.event.inputs.package | trim }}/${{ github.event.inputs.version | trim }}@${{ github.event.inputs.user_channel | trim }} steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -61,11 +65,13 @@ jobs: - name: build a package run: | - # get the path of the conanfile.py - PACKAGE_RECIPE_PATH="${{ github.event.inputs.package }}/${{ github.event.inputs.conanfile_path }}" - # build the package - conan create $PACKAGE_RECIPE_PATH ${{ github.event.inputs.package }}/${{ github.event.inputs.version }}@ --build=missing -s compiler=gcc -s compiler.version=11 -s compiler.libcxx=libstdc++11 -s build_type=Release + conan create $PACKAGE_RECIPE_PATH $PACKAGE_REF \ + --build=missing \ + -s compiler=gcc \ + -s compiler.version=11 \ + -s compiler.libcxx=libstdc++11 \ + -s build_type=Release - name: inspect built package diff --git a/.github/workflows/sync-to-artifactory.yml b/.github/workflows/sync-to-artifactory.yml index 06f978d..5fa5903 100644 --- a/.github/workflows/sync-to-artifactory.yml +++ b/.github/workflows/sync-to-artifactory.yml @@ -23,6 +23,7 @@ jobs: runs-on: ubuntu-latest env: CONAN_REVISIONS_ENABLED: 1 + PACKAGE_REF: ${{ github.event.inputs.package | trim }}/${{ github.event.inputs.version | trim }}@ steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -48,7 +49,11 @@ jobs: - name: Install package run: | - conan install ${{ github.event.inputs.package }}/${{ github.event.inputs.version }}@ -s compiler=gcc -s compiler.version=11 -s compiler.libcxx=libstdc++11 -s build_type=Release + conan install $PACKAGE_REF \ + -s compiler=gcc \ + -s compiler.version=11 \ + -s compiler.libcxx=libstdc++11 \ + -s build_type=Release - name: inspect installed package run: |