-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into PP-476-Make-PPS-CF-a-bundled-package
- Loading branch information
Showing
57 changed files
with
14,816 additions
and
121 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
name: conan-package-resources | ||
|
||
on: | ||
push: | ||
paths: | ||
- '.github/workflows/conan-package-resources.yml' | ||
- 'resources/definitions/**' | ||
- 'resources/extruders/**' | ||
- 'resources/images/**' | ||
- 'resources/intent/**' | ||
- 'resources/meshes/**' | ||
- 'resources/quality/**' | ||
- 'resources/variants/**' | ||
- 'resources/conanfile.py' | ||
branches: | ||
- 'main' | ||
- 'CURA-*' | ||
- 'PP-*' | ||
- 'NP-*' | ||
- '[0-9].[0-9]*' | ||
- '[0-9].[0-9][0-9]*' | ||
|
||
env: | ||
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} | ||
CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }} | ||
|
||
jobs: | ||
conan-recipe-version: | ||
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main | ||
with: | ||
project_name: cura_resources | ||
|
||
conan-package-export: | ||
needs: [ conan-recipe-version ] | ||
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 }} | ||
conan_recipe_root: "./resources/" | ||
secrets: inherit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
name: Feature Freeze | ||
run-name: Feature freeze Cura ${{ inputs.cura_version }} by @${{ github.actor }} | ||
|
||
on: | ||
workflow_dispatch: | ||
inputs: | ||
cura_version: | ||
description: 'Cura version major and minor, e.g. 5.7' | ||
required: true | ||
type: string | ||
|
||
jobs: | ||
parse-version: | ||
name: Parse input version string | ||
runs-on: ubuntu-latest | ||
outputs: | ||
package_version: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }}.0-alpha.1 | ||
steps: | ||
- name: Parse version string | ||
id: version_parser | ||
uses: booxmedialtd/ws-action-parse-semver@v1.4.7 | ||
with: | ||
input_string: ${{ inputs.cura_version }}.0 | ||
|
||
feature-freeze: | ||
name: Process feature freeze | ||
uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main | ||
needs: [parse-version] | ||
with: | ||
cura_version: ${{ needs.parse-version.outputs.package_version }} | ||
create_feature_branch: true | ||
secrets: inherit |
Oops, something went wrong.