3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Apply suggestions from code review

Browse source 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
This commit is contained in:
Jelle Spijker 2023-12-08 14:36:29 +01:00 • committed by GitHub
parent 065f22ba07
commit f2f2f742bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/conan-package.yml vendored
View file

@ -31,16 +31,15 @@ env:
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }}
# FIXME: point to `main` once merged
jobs:
conan-recipe-version:
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
with:
project_name: cura
conan-package-export:
needs: [ conan-recipe-version ]
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}

14
.github/workflows/installers.yml vendored
View file

@ -42,16 +42,15 @@ env:
jobs:
default_values:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@main
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
latest_release: '5.6'
latest_release_schedule_hour: 4
latest_release_tag: 'nightly'
# FIXME: point to `main` once merged
windows-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
needs: [ default_values ]
with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
@ -62,9 +61,8 @@ jobs:
operating_system: windows-2022
secrets: inherit
# FIXME: point to `main` once merged
linux-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
needs: [ default_values ]
with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
@ -75,9 +73,8 @@ jobs:
operating_system: ubuntu-22.04
secrets: inherit
# FIXME: point to `main` once merged
macos-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
needs: [ default_values ]
with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
@ -88,9 +85,8 @@ jobs:
operating_system: self-hosted-X64
secrets: inherit
# FIXME: point to `main` once merged
macos-arm-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
needs: [ default_values ]
with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}

3
.github/workflows/linux.yml vendored
View file

@ -45,9 +45,8 @@ env:
STAGING: ${{ inputs.staging || false }}
jobs:
# FIXME: point to `main` once merged
windows-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
conan_args: ${{ inputs.conan_args }}

3
.github/workflows/macos.yml vendored
View file

@ -49,9 +49,8 @@ env:
STAGING: ${{ inputs.staging || false }}
jobs:
# FIXME: point to `main` once merged
windows-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
conan_args: ${{ inputs.conan_args }}

3
.github/workflows/process-pull-request.yml vendored
View file

@ -4,8 +4,7 @@ on:
pull_request_target:
types: [ opened, reopened, edited, review_requested, ready_for_review, assigned ]
# FIXME: Use `main` instead of `CURA-10831` once merged
jobs:
add_label:
uses: ultimaker/cura-workflows/.github/workflows/process-pull-request.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/process-pull-request.yml@main
secrets: inherit

3
.github/workflows/unit-test-post.yml vendored
View file

@ -6,9 +6,8 @@ on:
types: [ completed ]
jobs:
# FIXME: Use `main` instead of `CURA-10831` once merged
publish-test-results:
uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@main
with:
event: ${{ github.event.workflow_run.event }}
conclusion: ${{ github.event.workflow_run.conclusion }}

6
.github/workflows/unit-test.yml vendored
View file

@ -45,15 +45,13 @@ env:
CONAN_PASSWORD: ${{ secrets.CONAN_PASS }}
jobs:
# FIXME: Change to `main` instead of `CURA-10831` once merged
conan-recipe-version:
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
with:
project_name: cura
testing:
# FIXME: Change to `main` instead of `CURA-10831` once merged
uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main
needs: [ conan-recipe-version ]
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}

3
.github/workflows/windows.yml vendored
View file

@ -45,9 +45,8 @@ env:
STAGING: ${{ inputs.staging || false }}
jobs:
# FIXME: point to `main` once merged
windows-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-10831
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
with:
cura_conan_version: ${{ inputs.cura_conan_version }}
conan_args: ${{ inputs.conan_args }}