From 227b1069275d760ed89864553a6109bc52771d6a Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 21 Jun 2022 10:15:43 +0200 Subject: [PATCH] Use the new JFrog Artifactory server Only upload binaries to cura repo, the cura-ce should contain only recipes and sources Contributes to CURA-9365 --- .github/workflows/conan-package-create.yml | 10 +++++++--- .github/workflows/conan-recipe-export.yml | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index e5b43f4329..8aebf5e3e6 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -24,8 +24,10 @@ on: type: string env: - CONAN_LOGIN_USERNAME_ULTIMAKER: ${{ secrets.CONAN_USER }} - CONAN_PASSWORD_ULTIMAKER: ${{ secrets.CONAN_PASS }} + CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} + CONAN_LOGIN_USERNAME_CURA_CE: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA_CE: ${{ secrets.CONAN_PASS }} CONAN_LOG_RUN_TO_OUTPUT: 1 CONAN_LOGGING_LEVEL: ${{ inputs.conan_logging_level }} CONAN_NON_INTERACTIVE: 1 @@ -78,4 +80,6 @@ jobs: run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update - name: Upload the Package(s) - run: conan upload "*" -r ultimaker --all -c + run: | + conan upload "*" -r cura --all -c + conan upload "*" -r cura-ce -c diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index daf278b90a..32278d781b 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -32,8 +32,10 @@ on: type: boolean env: - CONAN_LOGIN_USERNAME_ULTIMAKER: ${{ secrets.CONAN_USER }} - CONAN_PASSWORD_ULTIMAKER: ${{ secrets.CONAN_PASS }} + CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} + CONAN_LOGIN_USERNAME_CURA_CE: ${{ secrets.CONAN_USER }} + CONAN_PASSWORD_CURA_CE: ${{ secrets.CONAN_PASS }} CONAN_LOG_RUN_TO_OUTPUT: 1 CONAN_LOGGING_LEVEL: ${{ inputs.conan_logging_level }} CONAN_NON_INTERACTIVE: 1 @@ -85,4 +87,6 @@ jobs: run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} - name: Upload the Package(s) - run: conan upload "*" -r ultimaker --all -c + run: | + conan upload "*" -r cura --all -c + conan upload "*" -r cura-ce -c