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.

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

5.1 #1691

Merged
merged 97 commits into from
Jul 13, 2022
Merged

5.1 #1691

Show file tree
Hide file tree
Changes from 94 commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
5e43302
Create or export a Conan package
jellespijker Jun 3, 2022
2f5e81c
Only do the export on the Linux OS
jellespijker Jun 3, 2022
3b6a528
Only export the recipe
jellespijker Jun 3, 2022
5db09b8
Split up the export and create jobs
jellespijker Jun 3, 2022
dd9fff9
Also install conan config in export job
jellespijker Jun 3, 2022
0ae39c7
Create package for this dev branch
jellespijker Jun 3, 2022
e0445a2
Checkout repo for conan-package-create job
jellespijker Jun 7, 2022
338f9e9
Don't pack CMake test executables
jellespijker Jun 7, 2022
224cbc7
Don't import dep dll's when packaging
jellespijker Jun 7, 2022
74d8c6e
Use latest Arcus and build shared
jellespijker Jun 7, 2022
e8abfde
Add status of conan-package job to README.md
jellespijker Jun 7, 2022
dccec27
Only require protobuf when arcus is needed
jellespijker Jun 9, 2022
97d7aa7
Merge branch 'main' into CURA-9365_fix_building_cura_main
jellespijker Jun 9, 2022
483f1f4
Add GitVersion configuration
jellespijker Jun 10, 2022
1aea6ae
Update ignore
jellespijker Jun 10, 2022
f6ed60f
Remove old clang-format file
jellespijker Jun 10, 2022
2b8e75b
Use the latest arcus package
jellespijker Jun 10, 2022
7fa5a79
Import dynamic libs for mac and windows to build dir
jellespijker Jun 10, 2022
85e7a59
Also build latest for this dev branch
jellespijker Jun 10, 2022
874d668
Merge branch 'main' into CURA-9365_fix_building_cura_main
jellespijker Jun 10, 2022
51e8de1
Use short_paths on Windows
jellespijker Jun 10, 2022
9ab4213
Merge branch 'main' into CURA-9365_fix_building_cura_main
jellespijker Jun 13, 2022
6f8d355
Merge branch 'main' into CURA-9365_fix_building_cura_main
jellespijker Jun 14, 2022
750c26b
Use the reusable workflows defined in Cura repo
jellespijker Jun 15, 2022
b074011
Use the correct name for the conan-package-create flow
jellespijker Jun 15, 2022
c1fd709
Point to correct branch
jellespijker Jun 15, 2022
a0ffdf1
Use needs to obtain output of previous job
jellespijker Jun 15, 2022
6b1b017
Don't use strategy
jellespijker Jun 15, 2022
3cd1c65
Allow for a bool to only build from local cache
jellespijker Jun 16, 2022
431cd12
Revert "Allow for a bool to only build from local cache"
jellespijker Jun 16, 2022
3487fc4
Notify about the status of the creation of package
jellespijker Jun 16, 2022
6f38e68
inherit secrets
jellespijker Jun 16, 2022
295cf08
Add importg manifest to ignore
jellespijker Jun 16, 2022
5200ed0
Use conandata for requirements
jellespijker Jun 16, 2022
b814325
Use semver compatible range modifier
jellespijker Jun 17, 2022
5e5e49a
Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building…
jellespijker Jun 17, 2022
c2d3723
Use system build tools
jellespijker Jun 17, 2022
f3a4bfe
Use UMBaseConanfile for recipe
jellespijker Jun 18, 2022
f473330
Fix typo
jellespijker Jun 18, 2022
2a39039
Also run on release branch
jellespijker Jun 21, 2022
e6e7d06
Uniform versioning
jellespijker Jun 21, 2022
6ce1f49
Use umbase 0.1.1 or higher
jellespijker Jun 22, 2022
bf1209f
add prereleasetag number
jellespijker Jun 22, 2022
ee14d38
Trigger when conandata is changed
jellespijker Jun 22, 2022
a7ff72e
pin umbase version
jellespijker Jun 22, 2022
efb071f
Fix unit-testing
jellespijker Jun 22, 2022
5b395eb
Always download conan config
jellespijker Jun 22, 2022
b0a351e
Needs to get the version first
jellespijker Jun 22, 2022
8783944
Upload conan binaries to cura repo
jellespijker Jun 22, 2022
8c62e8f
Point to -alpha
jellespijker Jun 22, 2022
3419624
Use latest
jellespijker Jun 22, 2022
c8b8404
Sync workflow across repo
jellespijker Jun 23, 2022
de1cf1c
Copy the curaengine to the bin directy for Mac&Linux
casperlamboo Jun 24, 2022
47946b9
only build clipper, arcus and protobuf shared
jellespijker Jun 26, 2022
ffdc7b5
Use full specified type
jellespijker Jun 26, 2022
1019395
Also compile curaengine on this branch
jellespijker Jun 26, 2022
f1aef58
Don't fill gaps more than once when using gradual infill
Ghostkeeper Jun 28, 2022
f4e9434
Fixed elsewhere.
rburema Jun 28, 2022
ef7715b
Merge pull request #1685 from Ultimaker/CURA-9295_dont_double_fill_in…
rburema Jun 28, 2022
eb710b2
Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building…
jellespijker Jun 29, 2022
4b5ed89
Merge remote-tracking branch 'origin/CURA-9365_fix_building_cura_main…
jellespijker Jun 29, 2022
92c777c
Use zlib 1.2.12
jellespijker Jun 29, 2022
c6a73ec
small fixes
jellespijker Jun 29, 2022
3861b1c
Fix for negative indices.
rburema Jun 29, 2022
506f856
Copy CuraEngine executable to package_folder
jellespijker Jun 30, 2022
7f7c021
Print prime-tower part of the raft first.
rburema Jun 30, 2022
58ff9e3
Merge branch 'CURA-9365_fix_building_cura_main' into 5.1
Ghostkeeper Jun 30, 2022
c154e85
Switch workflows to use 5.1 branches, and Conan config master
Ghostkeeper Jun 30, 2022
925f940
Always print prime-tower raft if prime-tower is enabled.
rburema Jun 30, 2022
02cbe41
Raft-extruder isn't nescesarily the adhesion extruder anymore.
rburema Jun 30, 2022
79daca2
Don't print 'all same extruder' prime raft without prime tower.
rburema Jul 1, 2022
f423267
Also guarantee convecity of model part of raft if required.
rburema Jul 1, 2022
36bad69
Check if all paths are empty in supposedly non-empty wall-path.
rburema Jul 1, 2022
819d09e
Expand check for empty paths
Ghostkeeper Jul 4, 2022
6c2ba16
Apply suggestions from code review.
rburema Jul 5, 2022
b16c5f0
Revert "Raft-extruder isn't nescesarily the adhesion extruder anymore."
rburema Jul 5, 2022
c187b78
The same, but refactored to be more efficient.
rburema Jul 5, 2022
5bd6636
Merge pull request #1688 from Ultimaker/CURA-9331_fix_randomize_start…
rburema Jul 5, 2022
d38b1d7
Defensive coding to prevent raft intersection.
rburema Jul 6, 2022
48a7f34
Merge pull request #1687 from Ultimaker/CURA-9225_prime_for_raft
casperlamboo Jul 6, 2022
408e693
Update unit-test workflow for new build flow
jellespijker Jul 7, 2022
70035c5
Update unit-test workflow for new build flow
jellespijker Jul 7, 2022
7cf5f47
Specify Release as build_type
jellespijker Jul 7, 2022
a20b11b
Switched order of cmake args
jellespijker Jul 7, 2022
f16c329
Protobug is not needed in build context
jellespijker Jul 7, 2022
57109b9
use cmake --build
jellespijker Jul 7, 2022
2bfdef9
Distance to moved point should be w.r.t. segment.
rburema Jul 8, 2022
a478bf0
Add pull request to gitversion
jellespijker Jul 8, 2022
3a73dd4
Use workflows from Cura branch CURA-9365
jellespijker Jul 8, 2022
adecda5
Use leaf settings in favor of `adhesion_extruder_nr`
casperlamboo Jul 11, 2022
0bb0084
Merge pull request #1690 from Ultimaker/CURA-9425_fix_simplify_spiralize
jellespijker Jul 11, 2022
b160509
Fix out of bounds in spiralize
Ghostkeeper Jul 11, 2022
3bcea00
Use new versioning reusable workflow
jellespijker Jul 12, 2022
12fe07e
Merge pull request #1693 from Ultimaker/CURA-9383
Joeydelarago Jul 13, 2022
e2b0eb7
Fix version number matching
casperlamboo Jul 13, 2022
b9cadd5
Delete GitVersion.yml
casperlamboo Jul 13, 2022
ee3670f
Apply suggestions from code review
Joeydelarago Jul 13, 2022
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
128 changes: 128 additions & 0 deletions .github/workflows/conan-package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
---
name: conan-package

# Exports the recipe, sources and binaries for Mac, Windows and Linux and upload these to the server such that these can
# be used downstream.
#
# It should run on pushes against main or CURA-* branches, but it will only create the binaries for main and release branches

on:
workflow_dispatch:
inputs:
create_binaries_windows:
required: true
default: false
description: 'create binaries Windows'
create_binaries_linux:
required: true
default: false
description: 'create binaries Linux'
create_binaries_macos:
required: true
default: false
description: 'create binaries Macos'

push:
paths:
- 'src/**'
- 'cmake/**'
- 'tests/**'
- 'conanfile.py'
- 'conandata.yml'
- 'CMakeLists.txt'
- '.github/workflows/conan-package.yml'
- '.github/worflows/requirements-conan-package.txt'
branches:
- main
- 'CURA-*'
- '[1-9]+.[0-9]+'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- '[1-9]+.[0-9]+'
- '[0-9]+.[0-9]+'

tags:
- '[1-9]+.[0-9]+.[0-9]+'
casperlamboo marked this conversation as resolved.
Show resolved Hide resolved

jobs:
conan-recipe-version:
uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
with:
project_name: curaengine

conan-package-export:
needs: [ conan-recipe-version ]
uses: ultimaker/cura/.github/workflows/[email protected]
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'ubuntu-20.04'
python_version: '3.10.4'
conan_config_branch: 'master'
conan_logging_level: 'info'
secrets: inherit

conan-package-create-macos:
# FIXME: For release branches: maybe rename the branch to release/**
if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1' || github.ref_name == 'CURA-9365_fix_building_cura_main' )) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_macos) }}
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
needs: [ conan-recipe-version, conan-package-export ]

uses: ultimaker/cura/.github/workflows/[email protected]
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
runs_on: 'macos-10.15'
python_version: '3.10.4'
conan_config_branch: 'master'
conan_logging_level: 'info'
secrets: inherit

conan-package-create-windows:
# FIXME: For release branches: maybe rename the branch to release/**
if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_windows) }}
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
needs: [ conan-recipe-version, conan-package-export ]

uses: ultimaker/cura/.github/workflows/[email protected]
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
runs_on: 'windows-2022'
python_version: '3.10.4'
conan_config_branch: 'master'
conan_logging_level: 'info'
secrets: inherit

conan-package-create-linux:
# FIXME: For release branches: maybe rename the branch to release/**
if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }}
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
needs: [ conan-recipe-version, conan-package-export ]

uses: ultimaker/cura/.github/workflows/[email protected]
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
runs_on: 'ubuntu-20.04'
python_version: '3.10.4'
conan_config_branch: 'master'
conan_logging_level: 'info'
secrets: inherit

notify-export:
if: ${{ always() }}
needs: [ conan-package-export ]

uses: ultimaker/cura/.github/workflows/[email protected]
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
with:
success: ${{ contains(join(needs.*.result, ','), 'success') }}
success_title: "New Conan recipe exported in ${{ github.repository }}"
success_body: "Exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
failure_title: "Failed to export Conan Export in ${{ github.repository }}"
failure_body: "Failed to exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
secrets: inherit

notify-create:
# FIXME: For release branches: maybe rename the branch to release/**
if: ${{ always() && ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux)) }}
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
needs: [ conan-package-create-macos, conan-package-create-windows, conan-package-create-linux ]

uses: ultimaker/cura/.github/workflows/[email protected]
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
with:
success: ${{ contains(join(needs.*.result, ','), 'success') }}
success_title: "New binaries created in ${{ github.repository }}"
success_body: "Created binaries for ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
failure_title: "Failed to create binaries in ${{ github.repository }}"
failure_body: "Failed to created binaries for ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
secrets: inherit
3 changes: 3 additions & 0 deletions .github/workflows/requirements-conan-package.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
conan
gitpython
sip==6.5.1
77 changes: 57 additions & 20 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
name: unit-test
# FIXME: This should be a reusable workflow

on:
push:
Expand All @@ -8,74 +9,110 @@ on:
- 'cmake/**'
- 'tests/**'
- 'conanfile.py'
- 'conandata.yml'
- 'CMakeLists.txt'
- '.github/workflows/unit-test.yml'
- '.github/worflows/requirements-conan-package.txt'
branches:
- main
- 'CURA-*'
- 'CT_fix'
- '[1-9]+.[0-9]+'
casperlamboo marked this conversation as resolved.
Show resolved Hide resolved
tags:
- '[5-9].[0-9].+*'
- '[1-9]+.[0-9]+.[0-9]+'
casperlamboo marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
paths:
- 'src/**'
- 'cmake/**'
- 'tests/**'
- 'conanfile.py'
- 'conandata.yml'
- 'CMakeLists.txt'
- '.github/workflows/unit-test.yml'
- '.github/worflows/requirements-conan-package.txt'
branches:
- main
- '[5-9].[0-9]'
- 'CURA-*'
- '[1-9]+.[0-9]+'
casperlamboo marked this conversation as resolved.
Show resolved Hide resolved
tags:
- '[1-9]+.[0-9]+.[0-9]+'
casperlamboo marked this conversation as resolved.
Show resolved Hide resolved

env:
CONAN_USER: ${{ secrets.CONAN_USER }}
CONAN_PASS: ${{ secrets.CONAN_PASS }}
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }}
CONAN_LOGIN_USERNAME_CURA_CE: ${{ secrets.CONAN_USER }}
CONAN_PASSWORD_CURA_CE: ${{ secrets.CONAN_PASS }}
CONAN_LOG_RUN_TO_OUTPUT: 1
CONAN_LOGGING_LEVEL: info
CONAN_NON_INTERACTIVE: 1

jobs:
conan-recipe-version:
uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365
Joeydelarago marked this conversation as resolved.
Show resolved Hide resolved
with:
project_name: curaengine

testing:
runs-on: ubuntu-20.04
needs: [ conan-recipe-version ]

steps:
- name: Checkout CuraEngine
uses: actions/checkout@v3

- name: Setup Python and pip
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: '3.10.4'
python-version: '3.10.x'
architecture: 'x64'
cache: 'pip'
cache-dependency-path: .github/workflows/requirements-conan-package.txt

- name: Prepare Conan and sip-build (Bash)
if: ${{ runner.os != 'Windows' }}
- name: Install Python requirements and Create default Conan profile
run: |
pip install --require-hashes -r requirements.txt
# FIXME: Once we fully support Conan change to: `conan config install https://github.com/Ultimaker/conan-config.git`
conan config install https://github.com/Ultimaker/conan-config.git -a "-b CURA-9177_Fix_CI_CD" -tf $HOME/.conan
pip install -r requirements-conan-package.txt
conan profile new default --detect
conan user -p $CONAN_PASS -r ultimaker $CONAN_USER
working-directory: .github/workflows/

- name: Use Conan download cache (Bash)
if: ${{ runner.os != 'Windows' }}
run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache"

- name: Cache Conan local repository packages (Bash)
uses: actions/cache@v3
if: ${{ runner.os != 'Windows' }}
with:
path: |
$HOME/.conan/data
key: ${{ runner.os }}-testing
$HOME/.conan/conan_download_cache
key: conan-${{ runner.os }}-${{ runner.arch }}

- name: Install Linux system requirements
if: ${{ runner.os == 'Linux' }}
run: sudo apt install build-essential checkinstall zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev -y

- name: Get Conan configuration
run: conan config install https://github.com/Ultimaker/conan-config.git

- name: Install dependencies
run: conan install . -o enable_testing=True -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update -g VirtualBuildEnv
run: conan install . ${{ needs.conan-recipe-version.outputs.recipe_id_full }} -o enable_testing=True -s build_type=Release --build=missing --update -g GitHubActionsRunEnv -g GitHubActionsBuildEnv

- name: Upload the Dependency package(s)
run: conan upload "*" -r ultimaker --all -c
run: conan upload "*" -r cura --all -c

- name: Set Environment variables from Conan install (bash)
if: ${{ runner.os != 'Windows' }}
run: |
. ./activate_github_actions_runenv.sh
. ./activate_github_actions_buildenv.sh
working-directory: cmake-build-release/conan

- name: Run Unit Test CuraEngine
id: run-test
run: |
cmake --toolchain cmake-build-release/conan/conan_toolchain.cmake -S . -B cmake-build-release/
cmake --build cmake-build-release/
cd cmake-build-release/
cmake --toolchain ./conan/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release -S .. -B .
cmake --build .
ctest --output-junit engine_test.xml
working-directory: cmake-build-release

- name: Publish Unit Test Results
id: test-results
Expand All @@ -86,4 +123,4 @@ jobs:
**/*.xml

- name: Conclusion
run: echo "Conclusion is ${{ fromJSON( steps.test-results.outputs.json ).conclusion }}"
run: echo "Conclusion is ${{ fromJSON( steps.test-results.outputs.json ).conclusion }}"
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ callgrind/*
build/*
debug_build/*
release_build/*
cmake-build-debug/*
cmake-build-release/*
cmake-build-*
cmake-build-*
libs/stb
*.pyc
*.exe
Expand Down Expand Up @@ -64,3 +64,6 @@ documentation/latex/*
## Test results.
tests/output.xml
callgrind.out.*

CMakeUserPresets.json
/conan_imports_manifest.txt
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ if (ENABLE_ARCUS)
message(STATUS "Building with Arcus")

find_package(arcus 5.0.0 REQUIRED)
find_package(protobuf_BUILD 3.17.1 REQUIRED) # Used for protoc
find_package(protobuf 3.17.1 REQUIRED) # Used for linking
find_package(protobuf 3.17.1 REQUIRED)
protobuf_generate_cpp(engine_PB_SRCS engine_PB_HEADERS Cura.proto)
endif ()

Expand Down
55 changes: 55 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
mode: ContinuousDelivery
next-version: 5.1
branches:
main:
regex: ^main$
mode: ContinuousDelivery
tag: alpha
increment: None
prevent-increment-of-merged-branch-version: true
track-merge-target: false
source-branches: [ ]
tracks-release-branches: false
is-release-branch: false
is-mainline: true
pre-release-weight: 55000
develop:
regex: ^CURA-.*$
mode: ContinuousDelivery
tag: alpha
increment: None
prevent-increment-of-merged-branch-version: false
track-merge-target: true
source-branches: [ 'main' ]
tracks-release-branches: true
is-release-branch: false
is-mainline: false
pre-release-weight: 0
release:
regex: ^[\d].[\d]$
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
regex: ^[\d].[\d]$
regex: ^[0-9]+.[0-9]+$

mode: ContinuousDelivery
tag: beta
increment: None
prevent-increment-of-merged-branch-version: true
track-merge-target: false
source-branches: [ 'main' ]
tracks-release-branches: false
is-release-branch: true
is-mainline: false
pre-release-weight: 30000
pull-request-main:
regex: ^(pull|pull\-requests|pr)[/-]
mode: ContinuousDelivery
tag: alpha+
increment: Inherit
prevent-increment-of-merged-branch-version: true
tag-number-pattern: '[/-](?<number>\d+)[-/]'
track-merge-target: true
source-branches: [ 'main' ]
tracks-release-branches: false
is-release-branch: false
is-mainline: false
pre-release-weight: 30000
ignore:
sha: [ ]
merge-message-formats: { }
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<p align="center">
<a href="https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml" alt="Unit Tests">
<img src="https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg" /></a>
<a href="https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml" alt="Unit Tests">
<img src="https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml/badge.svg" /></a>
<a href="https://github.com/Ultimaker/CuraEngine/issues" alt="Open Issues">
<img src="https://img.shields.io/github/issues/ultimaker/curaengine" /></a>
<a href="https://github.com/Ultimaker/CuraEngine/issues?q=is%3Aissue+is%3Aclosed" alt="Closed Issues">
Expand Down
Loading