diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 3d59817996..d14701d278 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -65,6 +65,8 @@ jobs: name: Create tags runs-on: ubuntu-latest needs: [parse-version, find-rc-tag] + outputs: + main_commit: ${{ steps.export-main-commit.outputs.main_commit }} strategy: matrix: repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] @@ -76,11 +78,23 @@ jobs: ref: ${{ needs.parse-version.outputs.branch_name }} token: ${{ secrets.CURA_AUTORELEASE_PAT }} - - name: Create tag + - name: Create RC tag run: | git tag ${{ needs.find-rc-tag.outputs.tag_name }} git push origin tag ${{ needs.find-rc-tag.outputs.tag_name }} + - name: Create or update release tag + run: | + git tag -f ${{ inputs.cura_version }} + git push -f origin tag ${{ inputs.cura_version }} + + - name: Export Cura tagged commit + id: export-main-commit + if: ${{ matrix.repository == 'Cura' }} + run: | + echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT" + + create-dependencies-packages: name: Create conan packages for dependencies uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main @@ -131,7 +145,7 @@ jobs: create-release-draft: name: Create the release draft runs-on: ubuntu-latest - needs: [create-installers, parse-version] + needs: [create-installers, parse-version, create-tags] steps: - name: Checkout Cura repo uses: actions/checkout@v4 @@ -141,16 +155,10 @@ jobs: - name: Extract changelog run: python ./scripts/extract_changelog.py --version ${{ needs.parse-version.outputs.version_major }}.${{ needs.parse-version.outputs.version_minor }}.${{ needs.parse-version.outputs.version_patch }} --changelog ./resources/texts/change_log.txt > formatted_changelog.txt - - name: Get commit id for release - id: get-commit-id - uses: iawia002/get-tag-or-commit-id@v1.0.1 - with: - length: 40 - - name: Create release uses: notpeelz/action-gh-create-release@v5.0.1 with: - target: ${{ steps.get-commit-id.outputs.id }} + target: ${{ needs.create-tags.outputs.main_commit }} tag: ${{ inputs.cura_version }} strategy: replace title: UltiMaker Cura ${{ inputs.cura_version }} diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 101efee3b1..a0fffeeaec 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -172,6 +172,7 @@ "default_value": 3, "description": "The height difference between the tip of the nozzle and the lowest part of the print head.", "label": "Nozzle Length", + "settable_globally": false, "settable_per_extruder": true, "settable_per_mesh": false, "settable_per_meshgroup": false,