From c20410d7321f5d6bb95418a4aad3475f5f19decb Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 3 Nov 2022 08:42:24 +0100 Subject: [PATCH] build info and create in one step --- .github/workflows/conan-package-create.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 7d4cbe2f59..a3b769fdb3 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -134,14 +134,15 @@ jobs: if: ${{ inputs.conan_config_branch == '' }} run: conan config install https://github.com/Ultimaker/conan-config.git - - name: Associate build information with the Conan package - run: conan_build_info --v2 start ${{ inputs.project_name }} ${{ github.run_number }}000${{ inputs.build_id }} - - name: Create the Packages if: ${{ !inputs.create_from_source }} run: | + conan_build_info --v2 start ${{ inputs.project_name }} ${{ github.run_number }}000${{ inputs.build_id }} conan lock create --reference ${{ inputs.recipe_id_full }} --build=missing --update conan install ${{ inputs.recipe_id_full }} --build=missing --update --lockfile=conan.lock + conan_build_info --v2 create buildinfo.json --lockfile conan.lock --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }} + conan_build_info --v2 publish buildinfo.json --url https://ultimaker.jfrog.io/artifactory --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }} + conan_build_info --v2 stop - name: Create the Packages (from source) if: ${{ inputs.create_from_source }} @@ -164,9 +165,3 @@ jobs: - name: Upload the Package(s) community if: ${{ always() && inputs.conan_upload_community == true }} run: conan upload "*" -r cura-ce -c - - - name: Create and Upload the build info - run: | - conan_build_info --v2 create buildinfo.json --lockfile conan.lock --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }} - conan_build_info --v2 publish buildinfo.json --url https://ultimaker.jfrog.io/artifactory --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }} - conan_build_info --v2 stop