Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CURA-12046 git tag was not updated #19536

Merged
merged 5 commits into from
Aug 19, 2024
Merged

CURA-12046 git tag was not updated #19536

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da1f7ed
Update the release tag if already existing
wawanbreton Aug 13, 2024
ce7743b
Use only the relevant tag when creating a release candidate
wawanbreton Aug 13, 2024
7a944e9
Get the proper commit to create the release
wawanbreton Aug 14, 2024
e63619d
Fix script syntax
wawanbreton Aug 14, 2024
69bb462
Fix outputting the main commit
wawanbreton Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions .github/workflows/release-process_release-candidate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
Loading