Skip to content

Commit

Permalink
switched the other lines to mehtaheino
Browse files Browse the repository at this point in the history
  • Loading branch information
LH530-D1-MHI authored and LH530-D1-MHI committed Sep 28, 2023
1 parent f133c90 commit ca3e72a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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):
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit ca3e72a

Please sign in to comment.