-
-
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 pull request #19536 from Ultimaker/CURA-12046_git_tag_was_not_u…
…pdated CURA-12046 git tag was not updated
- Loading branch information
Showing
1 changed file
with
17 additions
and
9 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 |
---|---|---|
|
@@ -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/[email protected] | ||
with: | ||
length: 40 | ||
|
||
- name: Create release | ||
uses: notpeelz/[email protected] | ||
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 }} | ||
|