Skip to content

Commit 728308c

Browse files
committed
ATTIC-240 we now use Git
1 parent d0ad2e2 commit 728308c

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
asf-site/
22
.svn-legacy/
3+
*.tmp

retire.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def create_project(pid):
164164
description = meta.get('description', 'TBA'))
165165
with open(outfile, 'w', encoding='utf-8') as o:
166166
o.write(out)
167-
os.system("svn add %s" % outfile)
167+
os.system("git add %s" % outfile)
168168
print("Check XML file for customisations such as JIRA and mailing lists")
169169

170170
def find_wiki(pid):
@@ -182,7 +182,7 @@ def check_wiki(pid):
182182
if not flagname == pid:
183183
w.write(pid)
184184
w.write("\n")
185-
os.system("svn add %s" % flagfile)
185+
os.system("git add %s" % flagfile)
186186

187187
for arg in sys.argv[1:]:
188188
print("Processing "+arg)
@@ -196,7 +196,7 @@ def check_wiki(pid):
196196
create_jira_template(arg)
197197
os.mkdir(flagdir)
198198
open(join(flagdir, "git.keep"), 'a').close()
199-
os.system("svn add %s" % flagdir)
199+
os.system("git add %s" % flagdir)
200200
create_project(arg)
201201
update_stylesheet(arg)
202202
check_wiki(arg)

xdocs/process.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</ul>
4343
</li>
4444
<li>If the board approves the resolution, open an <a href="https://issues.apache.org/jira/browse/ATTIC">Attic JIRA</a> item - 'Move ${project} to the Attic'.<br />
45-
The Attic PMC will step in and create a detailed issue description using <a href="https://svn.apache.org/repos/asf/attic/site/retire.py"><code>retire.py</code></a>, with other generated parts to move the project to the Attic.<br />
45+
The Attic PMC will step in and create a detailed issue description using <a href="https://github.com/apache/attic/blob/main/retire.py"><code>retire.py</code></a>, with other generated parts to move the project to the Attic.<br />
4646
Generated issue content typically contains following steps (see <a href="#howto">"How to"</a> below for a description of each step):
4747
<ol type="1">
4848
<li><a href="#confirm-resolution">#</a> Confirm Board Resolution</li>
@@ -125,10 +125,10 @@ ${Name} on behalf of ${project} + the Attic.
125125
<title>How to: 3. Create project page on Attic site: https://attic.apache.org/projects/${project}.html</title>
126126

127127
<p>The Attic website is built using Anakia. <a href="https://velocity.apache.org/anakia/">Anakia</a> is an old site technology built on top of Apache Velocity.
128-
You can get the source for the site from Subversion: </p>
129-
<pre>svn co https://svn.apache.org/repos/asf/attic/site</pre>
128+
You can get the source for the site from Git: </p>
129+
<pre>git clone https://github.com/apache/attic</pre>
130130

131-
<p>You can generate the required changes using the Python3 <a href="https://svn.apache.org/repos/asf/attic/site/retire.py"><code>retire.py</code></a> script as follows:</p>
131+
<p>You can generate the required changes using the Python3 <a href="https://github.com/apache/attic/blob/main/retire.py"><code>retire.py</code></a> script as follows:</p>
132132
<pre>./retire.py id1 [id2...]</pre>
133133
<p>This should generate the following files for each ID, as well as updating <code>xdocs/stylesheets/project.xml</code>:</p>
134134
<ul>
@@ -137,10 +137,9 @@ ${Name} on behalf of ${project} + the Attic.
137137
<li><code>xdocs/projects/ID.xml</code></li>
138138
<li><code>cwiki_retired/WIKI_ID.txt</code> (this adds the CWIKI banner for projects)</li>
139139
</ul>
140-
<p>The code allows for wiki aliases, as described in the cwiki_retired/AAREADME.txt file.</p>
141-
<p>Review the changes in <code>xdocs/</code>, then commit to svn.</p>
142-
<p>The <code>ID.jira.tmp</code> file is text that can be copy-pasted into a JIRA description. It should be deleted after use, and not committed to SVN.</p>
143-
<p>The <a href="https://ci2.apache.org/#/builders/16">buildbot job</a> will build the site and commit the result which will be published soon after.</p>
140+
<p>The code allows for wiki aliases, as described in the <code>cwiki_retired/AAREADME.txt</code> file.</p>
141+
<p>Review the changes in <code>xdocs/</code>, then commit to Git.</p>
142+
<p>The <code>ID.jira.tmp</code> file is text that can be copy-pasted into a JIRA description. It should be deleted after use, and not committed to Git.</p>
144143
</section>
145144

146145
<section id="doap">
@@ -171,7 +170,7 @@ new category: &lt;category rdf:resource="http://projects.apache.org/category/re
171170
<title>How to: 5. Get infra lock down project's resources</title>
172171
<p>Open an <a href="https://issues.apache.org/jira/browse/INFRA">Infrastructure JIRA</a> issue identifying the resources that need turning off/making read only.</p>
173172

174-
<p>The content of the issue can be generated using <a href="https://svn.apache.org/repos/asf/attic/site/infrajiratext.py"><code>infrajiratext.py</code></a>.</p>
173+
<p>The content of the issue can be generated using <a href="hhttps://github.com/apache/attic/blob/main/infrajiratext.py"><code>infrajiratext.py</code></a>.</p>
175174

176175
<p>Typically, it contains steps like following, that need to be tweaked based on assets of the retired project:
177176
<ul>
@@ -226,7 +225,7 @@ on behalf of the Apache Attic and the now retired Apache ${project} project
226225
</pre>
227226

228227
<p>It's important to include the boilerplate from the project's site so people
229-
know what we're talking about. </p>
228+
know what we're talking about.</p>
230229
</section>
231230

232231
</body>

0 commit comments

Comments
 (0)