From ca3e72a6d0c30abc8b3a374d12be1f18bd2c69e9 Mon Sep 17 00:00:00 2001 From: LH530-D1-MHI Date: Thu, 28 Sep 2023 13:28:44 +0300 Subject: [PATCH] switched the other lines to mehtaheino --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 12 ++++++------ .github/workflows/windows.yml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 30d0111acd0..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/latest@Aurelius-Nero/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/.github/workflows/macos.yml b/.github/workflows/macos.yml index d72392094d3..ae20b1dd859 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@Aurelius-Nero/main' + default: 'cura/latest@mehtaheino/main' required: true type: string conan_args: @@ -45,7 +45,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/latest@Aurelius-Nero/main' + default: 'cura/latest@mehtaheino/main' required: true type: string conan_args: @@ -102,7 +102,7 @@ jobs: - name: Materials checkout uses: actions/checkout@v3 with: - repository: Aurelius-Nero/fdm_materials + repository: mehtaheino/fdm_materials-v2 token: ${{ secrets.GITHUB_TOKEN }} path: fdm_materials @@ -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@Aurelius-Nero/master --build=missing --update && cd .. + run: cd fdm_materials && conan create . fdm_materials/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@Aurelius-Nero/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() @@ -203,7 +203,7 @@ jobs: run: | import os enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else "" - installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-${{ inputs.architecture }}" + installer_filename = f"MehtaHeino-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-${{ inputs.architecture }}" output_env = os.environ["GITHUB_OUTPUT"] content = "" if os.path.exists(output_env): diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3cea438400c..3e14792f3a8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,7 +6,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/5.5.0-alpha@Aurelius-Nero/main' + default: 'cura/5.5.0-alpha@mehtaheino/main' required: true type: string conan_args: @@ -42,7 +42,7 @@ on: inputs: cura_conan_version: description: 'Cura Conan Version' - default: 'cura/5.5.0-alpha@Aurelius-Nero/main' + default: 'cura/5.5.0-alpha@mehtaheino/main' required: true type: string conan_args: @@ -94,7 +94,7 @@ jobs: - name: Checkout materials repository uses: actions/checkout@v3 with: - repository: Aurelius-Nero/fdm_materials + repository: mehtaheino/fdm_materials-v2 token: ${{ secrets.GITHUB_TOKEN }} path: fdm_materials @@ -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@Aurelius-Nero/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/5.4.0-beta.1@mehtaheino/master #- name: Upload the Package(s) # if: always() @@ -167,7 +167,7 @@ jobs: run: | import os enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else "" - installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-${{ inputs.architecture }}" + installer_filename = f"MehtaHeino-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-${{ inputs.architecture }}" output_env = os.environ["GITHUB_OUTPUT"] content = "" if os.path.exists(output_env):