Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
32817f4d
Commit
32817f4d
authored
5 months ago
by
Virgile Prevosto
Browse files
Options
Downloads
Patches
Plain Diff
[release-dev] document retargeting step
parent
293a5d6c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
doc/release/branch.tex
+11
-17
11 additions, 17 deletions
doc/release/branch.tex
with
11 additions
and
17 deletions
doc/release/branch.tex
+
11
−
17
View file @
32817f4d
...
...
@@ -9,23 +9,6 @@ Create the milestone for the next releases on \textsf{Gitlab},
in the Frama-C group. They will be used for development that will not
be integrated into the upcoming release.
\expertise
{
François, Julien
}
.
\section
{
``Freezing'' master
}
When the ``freeze'' period arrives (usually a few weeks before the beta
release), the release manager may decide to prevent direct merges to the
\texttt
{
master
}
branch, until the
\texttt
{
stable
}
branch is created. If so, then
the branch should be protected such that Developers can no longer push and merge
to it, without asking for a Maintainer to do it. In Gitlab, this is done via:
Frama-C project
$
\rightarrow
$
Settings
$
\rightarrow
$
Repository
$
\rightarrow
$
Protected Branches.
\\
\textbf
{
The
\texttt
{
master
}
branch must be protected
\emph
{
at all times
}
.
Parameters
\texttt
{
Allowed to merge
}
and
\texttt
{
Allowed to push
}
must be set to
\texttt
{
Developers + Maintainers
}
during non-freeze times, and to
\texttt
{
Maintainers
}
during freeze time.
}
\section
{
Creating the branch
}
\textbf
{
Note:
}
You must be member of the GitLab groups "frama-c", "dev" and have
...
...
@@ -57,6 +40,17 @@ allowed to push/merge).
\textbf
{
Note:
}
If there are still merge requests tagged for this release, make
sure to set their targeted branch to
\texttt
{
stable/release
}
.
\section
{
Retargeting Merge Requests
}
Another command of
\texttt
{
frama-ci
}
allows retargeting
the opened merge requests associated to the milestone corresponding
to this release so that they will be merged to
\texttt
{
stable/release
}
and not
\texttt
{
master
}
. Run the command
\begin{shell}
frama-ci-retarget-merge-requests --token=
$
TOKEN
\
--
branch
=
stable
/
release
--
milestone
=
"number
(
release
)
"
\end
{
shell
}
\section
{
GitLab issues
}
{
\em
This is currently done periodically in specific Frama
-
C meetings, so only
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment