From 337cc5e1fa86d405aae6ad1bfd429cbefec9ffff Mon Sep 17 00:00:00 2001 From: LH530-D1-MHI Date: Thu, 28 Sep 2023 14:02:58 +0300 Subject: [PATCH] few changes --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 4 ++-- .github/workflows/windows.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 872db290a1b..35a3379a8b8 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/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-v2/latest@mehtaheino/master #- name: Upload the Package(s) # if: always() diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ae20b1dd859..ccef370da6b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -159,13 +159,13 @@ jobs: run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache" - name: Create local materials package - run: cd fdm_materials && conan create . fdm_materials/latest@mehtaheino/master --build=missing --update && cd .. + run: cd fdm_materials && conan create . fdm_materials-v2/latest@mehtaheino/master --build=missing --update && cd .. - name: Create the local conan package run: conan create . $CURA_CONAN_VERSION --build=missing --update - 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/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-v2/latest@mehtaheino/master #- name: Upload the Package(s) # if: always() diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3e14792f3a8..55a15ab714b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -137,7 +137,7 @@ jobs: run: cd fdm_materials && conan create . fdm_materials/5.4.0-beta.1@Aurelius-Nero/master && cd .. - name: Create the Packages (Powershell) - run: conan install $Env:CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$Env:ENTERPRISE -o cura:staging=$Env:STAGING --json "cura_inst/conan_install_info.json" --require-override=fdm_materials/5.4.0-beta.1@mehtaheino/master + run: conan install $Env:CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$Env:ENTERPRISE -o cura:staging=$Env:STAGING --json "cura_inst/conan_install_info.json" --require-override=fdm_materials-v2/5.4.0-beta.1@mehtaheino/master #- name: Upload the Package(s) # if: always()