mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-07 14:04:03 -06:00
Merge branch 'main' into CURA-10831
# Conflicts: # .github/workflows/conan-package-create.yml # .github/workflows/conan-package.yml
This commit is contained in:
commit
37a4c5d19a
91 changed files with 12336 additions and 17874 deletions
6
.github/ISSUE_TEMPLATE/SlicingCrash.yaml
vendored
6
.github/ISSUE_TEMPLATE/SlicingCrash.yaml
vendored
|
@ -23,14 +23,14 @@ body:
|
|||
- type: input
|
||||
attributes:
|
||||
label: Cura Version
|
||||
placeholder: 5.3.1
|
||||
placeholder: 5.6.0
|
||||
validations:
|
||||
required: true
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
We work hard on improving our slicing crashes. Our most recent release is 5.3.1.
|
||||
If you are not on the latest version of Cura, [you can download it here](https://github.com/Ultimaker/Cura/releases/tag/5.3.1)
|
||||
We work hard on improving our slicing crashes. Our most recent release is 5.6.0.
|
||||
If you are not on the latest version of Cura, [you can download it here](https://github.com/Ultimaker/Cura/releases/latest)
|
||||
- type: input
|
||||
attributes:
|
||||
label: Operating System
|
||||
|
|
9
.github/workflows/conan-recipe-export.yml
vendored
9
.github/workflows/conan-recipe-export.yml
vendored
|
@ -80,7 +80,10 @@ jobs:
|
|||
conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}"
|
||||
|
||||
- name: Add Cura private Artifactory remote
|
||||
run: conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True
|
||||
run: conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True
|
||||
|
||||
- name: Set GH service account for remote cura-conan-dev
|
||||
run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}"
|
||||
|
||||
- name: Export the Package (binaries)
|
||||
if: ${{ inputs.conan_export_binaries }}
|
||||
|
@ -103,5 +106,5 @@ jobs:
|
|||
- name: Upload the Package(s) to the private Artifactory
|
||||
if: ${{ always() && ! inputs.conan_upload_community }}
|
||||
run: |
|
||||
conan upload ${{ inputs.recipe_id_full }} -r cura-private --all -c
|
||||
conan upload ${{ inputs.recipe_id_latest }} -r cura-private -c
|
||||
conan upload ${{ inputs.recipe_id_full }} -r cura-private-conan-dev --all -c
|
||||
conan upload ${{ inputs.recipe_id_latest }} -r cura-private-conan-dev -c
|
||||
|
|
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
|
@ -145,7 +145,7 @@ jobs:
|
|||
p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }}
|
||||
|
||||
- name: Remove private Artifactory
|
||||
run: conan remote remove cura-conan-private || true
|
||||
run: conan remote remove cura-private-conan-dev || true
|
||||
|
||||
- name: Get Conan configuration
|
||||
run: |
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue