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-10831 #274

Merged
merged 13 commits into from
Dec 8, 2023
Merged

CURA-10831 #274

merged 13 commits into from
Dec 8, 2023

Commits on Nov 11, 2023

  1. Set requirements and version with conandata 

    This will allow workflow automations to easily create release branches and set the versions

Contributes to CURA-10831
    @jellespijker
    jellespijker committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    3062a0b View commit details
    Browse the repository at this point in the history

  2. Use cura-workflows to determine version 

    Contributes to CURA-10831
    @jellespijker
    jellespijker committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    b8acd1c View commit details
    Browse the repository at this point in the history

  3. add release tagging info to conandata 

    Contributes to CURA-10831
    @jellespijker
    jellespijker committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    d7bc33c View commit details
    Browse the repository at this point in the history

  4. don't set release from conandata.yml 

    Contributes to CURA-10831
    @jellespijker
    jellespijker committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    45b57fb View commit details
    Browse the repository at this point in the history

  5. Update conanfile.py and streamline GitHub workflow 

    Added an `export` method in conanfile.py to update the conandata with the current version. Minor modifications were also made to the GitHub workflow, removing redundant job steps and reformatting it for clarity. Version exports are now also disabled in the 'conan-package-export-linux' job.

Contributes to CURA-10831
    @jellespijker
    jellespijker committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    39893a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Remove export binaries option 

    Contributes to CURA-10831
    @jellespijker
    jellespijker committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    404e042 View commit details
    Browse the repository at this point in the history

  2. also run on PP branches 

    Contributes to CURA-10831
    @jellespijker
    jellespijker committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    32dd656 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge branch 'master' into CURA-10831

    @jellespijker
    jellespijker committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    37eaa2b View commit details
    Browse the repository at this point in the history

  2. Merge main and update versions 

    Contribute to CURA-10831
    @jellespijker
    jellespijker committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    b31b728 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Use process-pull-request workflow 

    Contribute to CURA-10831
    @jellespijker
    jellespijker committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    fcd9c03 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge remote-tracking branch 'origin/5.6' into CURA-10831

    @jellespijker
    jellespijker committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    54e75ad View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into CURA-10831

    @jellespijker
    jellespijker committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    0bcbfcc View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Casper Lamboo <[email protected]>
    @jellespijker @casperlamboo
    jellespijker and casperlamboo authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    5f03d65 View commit details
    Browse the repository at this point in the history