Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
fusiondirectory
fusiondirectory
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 49
    • Issues 49
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Operations
    • Operations
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • fusiondirectory
  • fusiondirectoryfusiondirectory
  • Wiki
  • New The fixes Branch

Last edited by bmortier Jul 05, 2019
Page history

New The fixes Branch

For FusionDirectory and Argonaut

  • Create the new milestone
  • Create the new fixes branch from master
  • Remove branch that we just merged
  • Merge Changelog.md, AUTHORS.md, UPGRADE.md into fusiondirectory -dev version
  • Merge Changelog.md into fusiondirectory-plugins -dev version

For FusionDirectory only

  • update include/variables_common.inc

Create the new milestone

  • For FusionDirectory
  • got to https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones create the new milestone

    • FusionDirectory 1.2.x
    • Start date, date of the milestone creation
    • Stop date is start date + 3 month
  • For Argonaut
  • got to https://gitlab.fusiondirectory.org/groups/argonaut/-/milestones create the new milestone

    • Argonaut 1.2.x
    • Start date, date of the milestone creation
    • Stop date is start date + 3 month

Create a new fixes branch from master

The branch should be named with the version of the release followed by -fixes.

ex: 1.2 is released the fixes branch is 1.2-fixes

Remove the branch we just merged

Merge Changelog.md, Authors.md, UPGRADE.md into -dev

This operation have inside a ticket with the label release and with a MR

Changelog.md, Authors, UPGRADE.md have to be merged into -dev after a release to ensure that the merge from the -dev to master will be easy.

git checkout 1.2.1-fixes -- AUTHORS.md
git checkout 1.2.1-fixes -- Changelog.md
git checkout 1.2.1-fixes -- UPGRADE.md

Increment FusionDirectory version

open include/variables_common.inc

Change the version number in :

define ("FD_VERSION", "1.2-fixes");
Clone repository
  • CompleteWorkflowTicket
  • Create Official Debian Packages
  • Create Official RPM Packages
  • CreateOfficialDebian Packages
  • FallbackNonDefaultBranch
  • Fixes Branch Packages
  • FusionDirectory13
  • Fusiondirectory14
  • How make an MR from an external gitlab MR
  • HowToManageLabels
  • HowToManageLabelsPackaging
  • HowToTellPackagers
  • MakeAnMRFromGithubPR
  • New The fixes Branch
  • Release Adapting Test
View All Pages