From 3521947fefb72a9524b33e296b3b55cb9d6762a3 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Thu, 27 Jul 2023 13:49:21 +0200 Subject: [PATCH 1/3] Upload packages to jfrog --- .github/workflows/conan-package-create.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 701a978cd8..98e207acf3 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -151,7 +151,9 @@ jobs: - 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 "*" -r cura --all -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} From fa6961a45035e5a0136423439ae23ff9ab5c5eab Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 27 Jul 2023 13:52:15 +0200 Subject: [PATCH 2/3] Revert "Upload packages to jfrog" This reverts commit 3521947fefb72a9524b33e296b3b55cb9d6762a3. --- .github/workflows/conan-package-create.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 98e207acf3..701a978cd8 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -151,9 +151,7 @@ jobs: - name: Upload the Package(s) if: ${{ always() && inputs.conan_upload_community }} - run: | - conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - conan upload "*" -r cura --all -c + run: conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} From d08e2bc018026d7528199c96da17dbe48fa2511f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 28 Jul 2023 11:16:51 +0200 Subject: [PATCH 3/3] Increased max conan version to 1.60.0 For some magical reason, i got issues with 1.56.0. It used to work but when I needed to do a conan install, it suddenly failed to install any python packages, claiming I didn't have openssl. --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 438e3f07b7..520e7a693f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,7 @@ from conan.tools.env import VirtualRunEnv, Environment, VirtualBuildEnv from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration, ConanException -required_conan_version = "<=1.56.0" +required_conan_version = "<=1.60.0" class CuraConan(ConanFile):