diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index de3415f93b..01a64f5180 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -143,6 +143,9 @@ jobs: p12-file-base64: ${{ secrets.MACOS_CERT_INSTALLER_P12 }} p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }} + - name: Remove private Artifactory + run: conan remote remove cura-conan-private || true + - name: Get Conan configuration run: | conan config install https://github.com/Ultimaker/conan-config.git @@ -155,7 +158,7 @@ jobs: run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json" - name: Upload the Package(s) - if: always() + if: ${{ inputs.operating_system != 'self-hosted' }} run: | conan upload "*" -r cura --all -c diff --git a/conanfile.py b/conanfile.py index 1fae6d3a60..e99a61a4de 100644 --- a/conanfile.py +++ b/conanfile.py @@ -308,18 +308,18 @@ class CuraConan(ConanFile): self.requires("curaengine_grpc_definitions/latest@ultimaker/testing") self.requires("zlib/1.2.13") self.requires("pyarcus/5.3.0") - self.requires("curaengine/(latest)@ultimaker/stable") + self.requires("curaengine/(latest)@ultimaker/testing") self.requires("pysavitar/5.3.0") self.requires("pynest2d/5.3.0") self.requires("curaengine_plugin_gradual_flow/(latest)@ultimaker/testing") - self.requires("uranium/(latest)@ultimaker/stable") - self.requires("cura_binary_data/(latest)@ultimaker/stable") + self.requires("uranium/(latest)@ultimaker/testing") + self.requires("cura_binary_data/(latest)@ultimaker/testing") self.requires("cpython/3.10.4") if self.options.internal: self.requires("cura_private_data/(latest)@ultimaker/testing") self.requires("fdm_materials/(latest)@internal/testing") else: - self.requires("fdm_materials/(latest)@ultimaker/stable") + self.requires("fdm_materials/(latest)@ultimaker/testing") def build_requirements(self): if self.options.devtools: