Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Casper Lamboo <[email protected]>
  • Loading branch information
jellespijker and casperlamboo authored Dec 8, 2023
1 parent 0bcbfcc commit 5f03d65
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/conan-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ on:
- '[0-9]+.[0-9]+.[0-9]*'
- '[0-9]+.[0-9]+.[0-9]'

# 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: fdm_materials

conan-package-export-linux:
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 }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/process-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5f03d65

Please sign in to comment.