diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 18e2600e1d..6bffbb8857 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -139,15 +139,26 @@ jobs: conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - name: Add Cura private Artifactory remote - run: conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True + run: | + conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True + conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True + + - name: Set GH service account for remote cura-conan-dev + run: | + conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev ${{ secrets.CONAN_GH_RUNNER_USER }} + conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev ${{ secrets.CONAN_GH_RUNNER_USER }} - name: Create the Packages run: conan install ${{ inputs.recipe_id_full }} --build=missing --update -c tools.build:skip_test=True - name: Upload the Package(s) if: ${{ always() && inputs.conan_upload_community }} - run: conan upload ${{ inputs.recipe_id_full }} -r cura --all -c + run: | + conan upload ${{ inputs.recipe_id_full }} -r cura --all -c + conan upload ${{ inputs.recipe_id_full }} -r cura-conan-dev --all -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} - run: conan upload ${{ inputs.recipe_id_full }} -r cura-private --all -c + run: | + conan upload ${{ inputs.recipe_id_full }} -r cura-private --all -c + conan upload ${{ inputs.recipe_id_full }} -r cura-private-conan-dev --all -c diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 4b5c0f914a..736a5a7a99 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -118,6 +118,9 @@ jobs: conan config install https://github.com/Ultimaker/conan-config.git conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" + - name: Set GH service account for remote cura-conan-dev + run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev ${{ secrets.CONAN_GH_RUNNER_USER }} + - name: Create the Packages run: conan create . ${{ needs.conan-recipe-version.outputs.recipe_id_full }} --build=missing --update -o ${{ needs.conan-recipe-version.outputs.project_name }}:devtools=True -o ${{ needs.conan-recipe-version.outputs.project_name }}:enable_i18n=True -c tools.build:skip_test=True @@ -129,7 +132,9 @@ jobs: if: always() run: | conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_full }} -r cura --all -c + conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_full }} -r cura-conan-dev --all -c conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura -c + conan upload ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura-conan-dev -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')) }} diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index ba5aaa49a1..9d72d9fa8a 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -80,7 +80,14 @@ jobs: conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}" - name: Add Cura private Artifactory remote - run: conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True + run: | + conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True + conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True + + - name: Set GH service account for remote cura-conan-dev + run: | + conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-conan-dev ${{ secrets.CONAN_GH_RUNNER_USER }} + conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev ${{ secrets.CONAN_GH_RUNNER_USER }} - name: Export the Package (binaries) if: ${{ inputs.conan_export_binaries }} @@ -98,10 +105,14 @@ jobs: if: ${{ always() && inputs.conan_upload_community }} run: | conan upload ${{ inputs.recipe_id_full }} -r cura --all -c + conan upload ${{ inputs.recipe_id_full }} -r cura-conan-dev --all -c conan upload ${{ inputs.recipe_id_latest }} -r cura -c + conan upload ${{ inputs.recipe_id_latest }} -r cura-conan-dev -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} run: | conan upload ${{ inputs.recipe_id_full }} -r cura-private --all -c + conan upload ${{ inputs.recipe_id_full }} -r cura-private-conan-dev --all -c conan upload ${{ inputs.recipe_id_latest }} -r cura-private -c + conan upload ${{ inputs.recipe_id_latest }} -r cura-private-conan-dev -c