diff options
| author | jelle spijker <j.spijker@ultimaker.com> | 2022-11-03 10:14:07 +0300 |
|---|---|---|
| committer | jspijker <j.spijker@ultimaker.com> | 2022-11-03 10:14:07 +0300 |
| commit | 30555dbd5b31eea55f56d0109c7fa7bf8ec806ab (patch) | |
| tree | c1a1300ecba66cb6a2600de5c956f50458df42fd | |
| parent | ce8a7b610996de64b7f0540f88eb6f7aaa563dc5 (diff) | |
Use lockfile and build_id
| -rw-r--r-- | .github/workflows/conan-package-create.yml | 11 | ||||
| -rw-r--r-- | .github/workflows/conan-package.yml | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 4f55f0cd70..7d4cbe2f59 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -7,6 +7,10 @@ on: required: true type: string + build_id: + required: true + type: number + recipe_id_full: required: true type: string @@ -131,11 +135,13 @@ jobs: 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 }} + 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 install ${{ inputs.recipe_id_full }} --build=missing --update + run: | + conan lock create --reference ${{ inputs.recipe_id_full }} --build=missing --update + conan install ${{ inputs.recipe_id_full }} --build=missing --update --lockfile=conan.lock - name: Create the Packages (from source) if: ${{ inputs.create_from_source }} @@ -163,3 +169,4 @@ jobs: 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 diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 9bcd9635ee..0a3d4447c1 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -82,6 +82,7 @@ jobs: uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main with: project_name: cura + build_id: 1 recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} runs_on: 'ubuntu-20.04' python_version: '3.10.x' |