Skip to content

Commit

Permalink
Use correct workflows branch for the 5.9.1 'legal fix'.
Browse files Browse the repository at this point in the history
part of CURA-12400
  • Loading branch information
rburema committed Feb 18, 2025
1 parent c16ca5a commit 91a392a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/conan-package-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ env:

jobs:
conan-recipe-version:
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-12400_legal_fix
with:
project_name: cura_resources

conan-package-export:
needs: [ conan-recipe-version ]
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@CURA-12400_legal_fix
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/conan-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@ env:

jobs:
conan-recipe-version:
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-12400_legal_fix
with:
project_name: cura

conan-package-export:
needs: [ conan-recipe-version ]
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@CURA-12400_legal_fix
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
secrets: inherit

conan-package-create:
needs: [ conan-recipe-version, conan-package-export ]
uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main
uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@CURA-12400_legal_fix
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
conan_extra_args: "-o cura:enable_i18n=True"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ env:

jobs:
default_values:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@main
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@CURA-12400_legal_fix
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
latest_release: '5.6'
latest_release_schedule_hour: 4
latest_release_tag: 'nightly'

windows-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-12400_legal_fix
needs: [ default_values ]
with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
Expand All @@ -85,7 +85,7 @@ jobs:
secrets: inherit

linux-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-12400_legal_fix
needs: [ default_values ]
with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
Expand All @@ -97,7 +97,7 @@ jobs:
secrets: inherit

macos-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-12400_legal_fix
needs: [ default_values ]
with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
Expand All @@ -109,7 +109,7 @@ jobs:
secrets: inherit

macos-arm-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-12400_legal_fix
needs: [ default_values ]
with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ on:

jobs:
linux-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-12400_legal_fix
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
conan_args: ${{ inputs.conan_args }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ on:

jobs:
macos-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-12400_legal_fix
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
conan_args: ${{ inputs.conan_args }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ on:

jobs:
windows-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@@CURA-12400_legal_fix
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
conan_args: ${{ inputs.conan_args }}
Expand Down

0 comments on commit 91a392a

Please sign in to comment.