From dde9384c04ef3cd553ccf0ae94d9afb62223fc0c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 23 Sep 2023 19:12:37 +0200 Subject: [PATCH 1/5] clean the slate self-hosted runners are persistent since the the internal repo installs the private artifactory when run from there, the public repo tries to use that data, but from here we don't have access to the sources. This steps ensure that the private Artifactory is unknown in the public repo --- .github/workflows/macos.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index de3415f93b..4e30de2748 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 + - name: Get Conan configuration run: | conan config install https://github.com/Ultimaker/conan-config.git From b1e5718e72971c999fa91cf9762c905a82fff887 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 23 Sep 2023 19:15:38 +0200 Subject: [PATCH 2/5] allow cmd to to fail --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4e30de2748..a428439b24 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -144,7 +144,7 @@ jobs: p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }} - name: Remove private Artifactory - run: conan remote remove cura-conan-private + run: conan remote remove cura-conan-private || true - name: Get Conan configuration run: | From f8425b039a1890b7184715479d19e7a577f80203 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 23 Sep 2023 19:24:48 +0200 Subject: [PATCH 3/5] don't upload packages from self-hosted --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a428439b24..9d9bec6208 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -158,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: always() && ${{ inputs.operating_system != 'self-hosted' }} run: | conan upload "*" -r cura --all -c From e25f1b03a5090cb1732776b04384949be19b7c14 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 23 Sep 2023 19:33:00 +0200 Subject: [PATCH 4/5] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9d9bec6208..01a64f5180 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -158,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() && ${{ inputs.operating_system != 'self-hosted' }} + if: ${{ inputs.operating_system != 'self-hosted' }} run: | conan upload "*" -r cura --all -c From 24e1cfa2b7b8db480cf8992ca92e31c8d9c7963f Mon Sep 17 00:00:00 2001 From: jellespijker Date: Fri, 29 Sep 2023 15:25:48 +0200 Subject: [PATCH 5/5] Use `testing` for dependencies on `main` Otherwise, we will use the same dependencies for 5.5.0-beta. Such as CuraEngine and fdm_materials etc. --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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: