From 9eb8cbcbf755ea13c4c7dee02e22b351eb99f297 Mon Sep 17 00:00:00 2001 From: LH530-D1-MHI Date: Thu, 28 Sep 2023 16:28:27 +0300 Subject: [PATCH] minor-test-2 --- .github/workflows/linux.yml | 2 +- conandata.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 35a3379a8b8..872db290a1b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -170,7 +170,7 @@ jobs: run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache" - name: Create the Packages (Bash) - 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" --require-override=fdm_materials-v2/latest@mehtaheino/master + 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" --require-override=fdm_materials/latest@mehtaheino/master #- name: Upload the Package(s) # if: always() diff --git a/conandata.yml b/conandata.yml index 3dfd1dcd7ff..1bdd4f824a3 100644 --- a/conandata.yml +++ b/conandata.yml @@ -61,7 +61,7 @@ pyinstaller: src: "windows" dst: "share/windows" fdm_materials: - package: "fdm_materials-v2" + package: "fdm_materials" src: "res/resources/materials" dst: "share/cura/resources/materials" tcl: