Author: dsahlberg
Date: Sat Jul 5 18:28:12 2025
New Revision: 1926978
URL: http://svn.apache.org/viewvc?rev=1926978&view=rev
Log:
In site/publish: Merge r1924631 and c1926977 from staging.
Remove references to buildbot / ci2.apache.org and replace with references to
GitHub Actions where appropriate. Link to GHA Policy.
* .htaccess
(/buildbot/... redirects): Replace with redirects to GHA
* contributing.html
(#issues): Remove paragraph about adding a node to the build farm
* docs/community-guide/building.part.html
(#build-farm): Reword paragraph to point to GHA,
Link to the GitHub Actions Policy and Infra Report
* staging/docs/community-guide/releasing.part.html
(#release-stabilization-how-to-nominate): Rephrase to mention GHA
(#creating-branch-manual): Move the action to update the backport conflict
detection job to before creating the branch, saving a manual merge later.
(#backport-merge-bot): Remove reference to the buildbot slaves.
* ideas.html
(#ideas): Remove reference to buildbot from the Enable interoperability
testing bullet point.
* mailing-lists.html
(notifications@): Remove buildbot and rephrase to singular.
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/.htaccess
subversion/site/publish/contributing.html
subversion/site/publish/docs/community-guide/building.part.html
subversion/site/publish/docs/community-guide/releasing.part.html
subversion/site/publish/ideas.html
subversion/site/publish/mailing-lists.html
Propchange: subversion/site/publish/
------------------------------------------------------------------------------
Merged /subversion/site/staging:r1924631,1926977
Modified: subversion/site/publish/.htaccess
URL: http://svn.apache.org/viewvc/subversion/site/publish/.htaccess?rev=1926978&r1=1926977&r2=1926978&view=diff
==============================================================================
--- subversion/site/publish/.htaccess (original)
+++ subversion/site/publish/.htaccess Sat Jul 5 18:28:12 2025
@@ -2,10 +2,10 @@
Options +Includes
RewriteEngine On
-RedirectMatch ^/buildbot/all$ https://ci2.apache.org/#/waterfall?tags=svn-prod\&tags=svn-warnings\&tags=svn-status\&tags=svn-compat
-RedirectMatch ^/buildbot/prod$ https://ci2.apache.org/#/waterfall?tags=svn-prod\&tags=svn-warnings
-RedirectMatch ^/buildbot/stat$ https://ci2.apache.org/#/waterfall?tags=svn-status
-RedirectMatch ^/buildbot/compat$ https://ci2.apache.org/#/waterfall?tags=svn-compat
+RedirectMatch ^/buildbot/all$ https://github.com/apache/subversion/actions
+RedirectMatch ^/buildbot/prod$ https://github.com/apache/subversion/actions
+RedirectMatch ^/buildbot/stat$ https://github.com/apache/subversion/actions
+RedirectMatch ^/buildbot/compat$ https://github.com/apache/subversion/actions
RedirectMatch ^/patches$ /docs/community-guide/general.html#patches
RedirectMatch ^/HACKING$ /docs/community-guide/
RedirectMatch ^/prerelease-caveats$ /docs/community-guide/releasing.html#prerelease-caveats
Modified: subversion/site/publish/contributing.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/contributing.html?rev=1926978&r1=1926977&r2=1926978&view=diff
==============================================================================
--- subversion/site/publish/contributing.html (original)
+++ subversion/site/publish/contributing.html Sat Jul 5 18:28:12 2025
@@ -135,24 +135,6 @@
other specific circumstances.</p>
</li>
-<li><p style="font-weight: bold;">Add a node to our build farm</p>
-
- <p>Subversion has a large regression test suite that takes a
- non-trivial amount of time to run. Even though developers are
- encouraged to run these tests before committing changes,
- sometimes things fall through the cracks — "obvious"
- changes turn out not to be, platform-specific bugs crop up,
- etc. To help us catch these sorts of things, we employ a
- <a href="/buildbot/all">buildbot farm</a>
- of machines continuously testing our codebase as it changes.
- So even if you can't personally take the time to actively test
- Subversion, if you have a computer with cycles to spare, please
- consider adding it as a node in our buildbot farm. We can
- always benefit from having our test suite executed continuously
- on additional operating systems and machine architectures.</p>
- <p class="todo">Point to buildbot node configuration details here.</p>
-</li>
-
</ul>
</div> <!-- #issues -->
Modified: subversion/site/publish/docs/community-guide/building.part.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/building.part.html?rev=1926978&r1=1926977&r2=1926978&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/building.part.html (original)
+++ subversion/site/publish/docs/community-guide/building.part.html Sat Jul 5 18:28:12 2025
@@ -255,31 +255,28 @@ href="https://svn.apache.org/repos/asf/s
title="Link to this section">¶</a>
</h2>
-<p>The <a href="https://www.apache.org/dev/infrastructure.html">ASF
-Infrastructure</a> team manages
-a <a href="https://buildbot.net/">BuildBot</a> build/test
-farm. The Buildbot waterfall for the Subversion project is located here:</p>
-<ul>
- <li><a href="/buildbot/prod">Production builds</a></li>
- <li><a href="/buildbot/stat">Backport
- and RAT status</a></li>
- <li><a href="/buildbot/compat">Compatibility tests</a></li>
- <li><a href="/buildbot/all">The whole farm</a></li>
-</ul>
-<p>For more information about build services, head over
-to <a href="https://ci2.apache.org/">ci2.apache.org</a>.
+<p>Subversion is using GitHub Actions to do CI testing on each commit. See
+<a href="https://github.com/apache/subversion/actions"
+>https://github.com/apache/subversion/actions</a> (you need to login with an
+ASF connected GitHub account).
</p>
-<p>If you'd like to receive notifications about buildbot build and
+<p>ASF Infra mandate some policies regarding GitHub Actions, see <a
+href="https://infra.apache.org/github-actions-policy.html">GitHub Actions
+Policy</a>. Current usage can be found on the <a
+href="https://infra-reports.apache.org/#ghactions&project=subversion&hours=168&limit=15&group=name"
+>Infra Reporting Dashboard</a>.
+</p>
+
+<p>If you'd like to receive notifications about build and
test failures, please subscribe to the <a
href="/mailing-lists.html#notifications-ml">notifications@</a> mailing list.
</p>
-<p>Buildbot is configured in the <a
-href="https://svn.apache.org/repos/infra/infrastructure/buildbot2/">Infra
-repository</a>, specifically, the <a
-href="https://svn.apache.org/repos/infra/infrastructure/buildbot2/projects/subversion.py"
->subversion.py</a> file.</p>
+<p>GitHub Actions is configured using the standard .github/workflows directory
+in /trunk and in each /branches/branch, see for example <a
+href="https://svn.apache.org/repos/asf/subversion/trunk/.github/workflows"
+>https://svn.apache.org/repos/asf/subversion/trunk/.github/workflows</a>.</p>
</div> <!-- build-farm -->
Modified: subversion/site/publish/docs/community-guide/releasing.part.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1926978&r1=1926977&r2=1926978&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/releasing.part.html (original)
+++ subversion/site/publish/docs/community-guide/releasing.part.html Sat Jul 5 18:28:12 2025
@@ -729,9 +729,8 @@ be made to the A.B.x branch that isn't a
<p>If you nominate an entry that causes merge conflicts until another
nomination is merged, note that in the nomination. Put a "Depends:" header
-in the entry; that will keep the hourly "detect nominations with merge
-conflict" buildbot job green. (The value of the "Depends:" header is not
-parsed.)</p>
+in the entry; that will keep the GitHub Actions "backportbot" job green.
+(The value of the "Depends:" header is not parsed.)</p>
<p>The tools/dist/nominate.pl script (in trunk) automates the process of adding
a new nomination. The same script also has a REPL loop that helps with the
@@ -1554,6 +1553,13 @@ highlighted:</div>
tools/dist/release.py—see above—but are documented here in case
the Release Manager wants to do them manually:</p>
<ul>
+<li><p>Make sure the backport conflict detection job will monitor the
+soon-to-be-created branch:</p>
+ <p>Add "A.B.x" to the branches array in <a
+ href="https://svn.apache.org/repos/asf/subversion/trunk/.github/workflows/detect-backport-conflicts.yml">https://svn.apache.org/repos/asf/subversion/trunk/.github/workflows/detect-backport-conflicts.yml</a>.</p>
+ <p>This must be done before the branch is created (or the change must
+ be merged back to the branch if done after creation).</li>
+
<li><p>Create the new release branch with a server-side copy:</p>
<pre>
svn cp ^/subversion/trunk \
@@ -1606,10 +1612,6 @@ the Release Manager wants to do them man
<li><p>Create a new <tt>STATUS</tt> file on the release branch.</p></li>
-<li><p>Make sure all buildbot builders are building the new release branch.</p>
- <p>Add A.B to the MINOR_LINES list in <a
- href="https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/subversion.conf">https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/subversion.conf</a>.</p></li>
-
<li><p>Create a template release-notes document,
<tt>site/publish/docs/release-notes/A.B.html</tt></p></li>
</ul>
@@ -1653,7 +1655,7 @@ svn up ~svnsvn/src/svn/<i>A.B.x</i> # f
update it to the revision it just committed. That's <a href="/issue4761"
>not guaranteed</a>
when updating from a mirror (and <tt>svn.a.o</tt> may point to a
- mirror). The buildbot slaves do this too, for the same reason.</p>
+ mirror).</p>
<p>Each branch is in a subdirectory of the WC root. To add a new
branch, populate the source tree with <tt>svn up</tt>:</p>
<pre>
Modified: subversion/site/publish/ideas.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/ideas.html?rev=1926978&r1=1926977&r2=1926978&view=diff
==============================================================================
--- subversion/site/publish/ideas.html (original)
+++ subversion/site/publish/ideas.html Sat Jul 5 18:28:12 2025
@@ -163,9 +163,7 @@ and the <a href="https://live.gnome.org/
<p>The tests frameworks (<tt>make check</tt>) have limited support for
testing with different client and server versions (1.8-dev clients and
1.7 server, for example; or vice-versa). Make it easier to run such
- interoperability/compatibility tests. Ideally, also lay the groundwork
- to setting up a <a href="/buildbot/all">buildslave</a>
- to run these tests regularly (we'll provide the hardware).</p>
+ interoperability/compatibility tests.</p>
<p>A related goal is compatibility with older on-disk formats, but at the
time of writing the author believes the <tt>--server-minor-version</tt>
option and <tt>upgrade_tests.py</tt> cover what is needed.</p>
Modified: subversion/site/publish/mailing-lists.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/mailing-lists.html?rev=1926978&r1=1926977&r2=1926978&view=diff
==============================================================================
--- subversion/site/publish/mailing-lists.html (original)
+++ subversion/site/publish/mailing-lists.html Sat Jul 5 18:28:12 2025
@@ -320,11 +320,9 @@ delay for your post to appear (see below
<tr>
<td><strong>Description:</strong></td>
<td>This list receives automated messages from continuous integration
- (CI) systems, currently including
+ (CI) system, currently
<a href="https://github.com/apache/subversion/actions"
- >GitHub Actions</a> and the
- <a href="/buildbot/prod">buildbot</a> automated build and test
- system.</td>
+ >GitHub Actions</a>.</td>
<!--
For example, if you have set up an automated nightly "make; make
check" system to test Subversion on a particular platform, the
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.