<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px;
}
body {
font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<p class="details" style="font-style: italic; color: #626168;">
<a href="https://gitlab.rtems.org/amar">Amar Takhar</a> created an issue: <a href="https://gitlab.rtems.org/administration/gitlab/-/issues/109">#109</a>
</p>
<p>
Assignee: Amar Takhar
</p>
<div class="md" style="position: relative; z-index: 1; color: #3a383f; word-wrap: break-word;">
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">We have <a href="https://gitlab.rtems.org/contrib/" style="margin-top: 0;">https://gitlab.rtems.org/contrib/</a> but these are read-only mirrors from upstream. We can't make modifications to these <em>plus</em> we don't have CI for this namespace just <a href="https://gitlab.rtems.org/rtems/">https://gitlab.rtems.org/rtems/</a>. On top of that <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; font-weight: inherit; white-space: break-spaces; word-break: break-all; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: break-word; padding: 0.125rem 0.25rem;'>/contrib/</code> does not support out regular workflows which we want for maintaining our own port.</p>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">This port will be upstreamed and sit at <a href="https://micropython.org/" rel="nofollow noreferrer noopener" target="_blank" style="margin-top: 0;">https://www.micropython.org/</a>. We still need to develop this and have our own conversations before sending code upstream.</p>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">This issue creates the first repository that will sit under <a href="https://gitlab.rtems.org/contrib/" style="margin-top: 0;">https://gitlab.rtems.org/rtems/contrib/</a></p>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">The purpose of this is to hold repositories where <em style="margin-top: 0;">we own</em> the code and want to periodically upstream the changes made here.</p>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">In the case of this development situation the workflow will be as follows:</p>
<div class="gl-relative markdown-code-block js-markdown-code">
<pre data-canonical-lang="mermaid" class="code highlight js-syntax-highlight language-mermaid" v-pre="true" style='display: block; font-size: 14px; color: #3a383f; line-height: 1.6em; overflow-x: auto; border-radius: .25rem; position: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 1rem; padding: 12px; border: 1px solid #dcdcde;'><code class="js-render-mermaid" style='font-size: inherit; color: inherit; word-wrap: normal; word-break: keep-all; border-radius: .25rem; background-color: inherit; white-space: pre; margin-top: 0; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: normal; padding: unset;'><span id="LC1" class="line" lang="mermaid" style="margin-top: 0;">graph TD</span>
<span id="LC2" class="line" lang="mermaid"> micropython.org --> /contrib/micropython/</span>
<span id="LC3" class="line" lang="mermaid"> /contrib/micropython/ --> /rtems/contrib/micropython/</span>
<span id="LC4" class="line" lang="mermaid"> /rtems/contrib/micropython/ --> micropython.org</span>
<span id="LC5" class="line" lang="mermaid"> MR --> /rtems/contrib/micropython/</span>
<span id="LC6" class="line" lang="mermaid"> style MR color:#00C853</span></code></pre>
<copy-code></copy-code><insert-code-snippet></insert-code-snippet>
</div>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">The RSB will use the code from <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; margin-top: 0; font-weight: inherit; white-space: break-spaces; word-break: break-all; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: break-word; padding: 0.125rem 0.25rem;'>/contrib/micropython/</code>This ensures that changes we need to consume are upstreamed first. In some cases such as EPICS where it takes a long time for changes to get merged we will use the one under <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; font-weight: inherit; white-space: break-spaces; word-break: break-all; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: break-word; padding: 0.125rem 0.25rem;'>/rtems/contrib/</code> which could be the case for MicroPython.</p>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">All regular RTEMS workflow including CI will be used on the micropython repository</p>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">The default branch will be set to <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; margin-top: 0; font-weight: inherit; white-space: break-spaces; word-break: break-all; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: break-word; padding: 0.125rem 0.25rem;'>rtems</code> where our development will go.</p>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">This workflow has several advantages:</p>
<ol dir="auto" style="text-align: initial; margin: 0 0 1rem; padding: 0;">
<li style="margin-top: 0; line-height: 1.6em; margin-left: 25px; padding-left: 3px;">We get changes to the RTEMS namespace such as CI for free.</li>
<li style="line-height: 1.6em; margin-left: 25px; padding-left: 3px;">We will always be able to diff from the <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; margin-top: 0; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; white-space: pre-wrap; overflow-wrap: break-word; word-break: keep-all; padding: 0.125rem 0.25rem;'>rtems</code> branch to the <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; white-space: pre-wrap; overflow-wrap: break-word; word-break: keep-all; padding: 0.125rem 0.25rem;'>main</code> branch and see what differences need to be upstreamed creating a patch for this purpose is trivial and can be done via the GitLab UI.</li>
<li style="line-height: 1.6em; margin-left: 25px; padding-left: 3px;">Rebasing changes from the <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; margin-top: 0; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; white-space: pre-wrap; overflow-wrap: break-word; word-break: keep-all; padding: 0.125rem 0.25rem;'>main</code> branch to <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; white-space: pre-wrap; overflow-wrap: break-word; word-break: keep-all; padding: 0.125rem 0.25rem;'>rtems</code> will have to be done periodically but if there are conflicts upstream we will know when creating the MR.</li>
</ol>
<p dir="auto" style="color: #3a383f; margin: 0 0 1rem;" align="initial">We can carry our own development and testing before upstreaming and ensure approvals / decisions have been made before submitting code.</p>
<p dir="auto" style="color: #3a383f; margin: 0;" align="initial">This is is a distinctly different workflow from <code style='font-size: 90%; color: #18171d; word-wrap: break-word; border-radius: .25rem; background-color: #ececef; margin-top: 0; font-weight: inherit; white-space: break-spaces; word-break: break-all; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-variant-ligatures: none; overflow-wrap: break-word; padding: 0.125rem 0.25rem;'>/contrib/</code> as this is to handle code that we own and are not contributing to upstream on behalf of the project.</p>
</div>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #626168;">
—
<br>
<a href="https://gitlab.rtems.org/administration/gitlab/-/issues/109">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.rtems.org">gitlab.rtems.org</a>. <a href="https://gitlab.rtems.org/-/sent_notifications/030467d410115ffa5b1d40da8ffea481/unsubscribe" target="_blank" rel="noopener noreferrer">Unsubscribe</a> from this thread · <a href="https://gitlab.rtems.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.rtems.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<span style="color: transparent; font-size: 0; display: none; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0;">
Notification message regarding https://gitlab.rtems.org/administration/gitlab/-/issues/109 at 1755832554
</span>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Issue","url":"https://gitlab.rtems.org/administration/gitlab/-/issues/109"}}</script>
</p>
</div>
</body>
</html>