Only upload the actual package

(cherry picked from commit 5e2511252e)
This commit is contained in:
jspijker 2023-02-28 14:29:19 +01:00
parent d45f65d400
commit e40eb61ad8
3 changed files with 24 additions and 28 deletions

View file

@ -163,30 +163,20 @@ jobs:
if: ${{ inputs.build_info }}
run: conan_build_info --v2 create buildinfo.json --lockfile conan.lock --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }}
- name: Upload the Package(s)
if: always()
run: conan upload "*" -r cura --all -c
- name: Upload the build info
if: ${{ inputs.build_info }}
run: |
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: Upload the Package(s) community
if: ${{ always() && inputs.conan_upload_community == true }}
run: conan upload "*" -r cura-ce -c
- name: Upload the log and build artifacts
- name: Upload the Package(s)
if: always()
uses: actions/upload-artifact@v3
with:
name: log-${{ inputs.runs_on }}-${{ runner.arch }}
path: |
buildinfo.json
conan.lock
conanbuildinfo.txt
conaninfo.txt
graph_info.json
build/**
retention-days: 1
run: |
conan upload ${{ inputs.recipe_id_full }} -r cura --all -c
conan upload ${{ inputs.recipe_id_latest }} -r cura --all -c
- name: Upload the Package(s) community
if: ${{ inputs.conan_upload_community && always() }}
run: |
conan upload ${{ inputs.recipe_id_full }} -r cura-ce -c
conan upload ${{ inputs.recipe_id_latest }} -r cura-ce -c

View file

@ -127,11 +127,11 @@ jobs:
- name: Remove the latest alias
if: always()
run: conan remove ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura -f
run: conan remove ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura -f || true
- name: Remove the latest alias from cura-ce
if: always()
run: conan remove ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura-ce -f
run: conan remove ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura-ce -f || true
- name: Create the latest alias
if: always()
@ -140,8 +140,10 @@ jobs:
- name: Upload the Package(s)
if: always()
run: |
conan upload "*" -r cura --all -c
conan upload "*" -r cura-ce -c
conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_full }} -r cura --all -c
conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura --all -c
conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_full }} -r cura-ce -c
conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura-ce -c
notify-create:
if: ${{ always() && (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}

View file

@ -90,11 +90,11 @@ jobs:
- name: Remove the latest alias
if: always()
run: conan remove ${{ inputs.recipe_id_latest }} -r cura -f
run: conan remove ${{ inputs.recipe_id_latest }} -r cura -f || true
- name: Remove the latest alias from cura-ce
if: always()
run: conan remove ${{ inputs.recipe_id_latest }} -r cura-ce -f
run: conan remove ${{ inputs.recipe_id_latest }} -r cura-ce -f || true
- name: Create the latest alias
if: always()
@ -102,8 +102,12 @@ jobs:
- name: Upload the Package(s)
if: always()
run: conan upload "*" -r cura --all -c
run: |
conan upload ${{ inputs.recipe_id_full }} -r cura --all -c
conan upload ${{ inputs.recipe_id_latest }} -r cura --all -c
- name: Upload the Package(s) community
if: ${{ inputs.conan_upload_community && always() }}
run: conan upload "*" -r cura-ce -c
run: |
conan upload ${{ inputs.recipe_id_full }} -r cura-ce -c
conan upload ${{ inputs.recipe_id_latest }} -r cura-ce -c