[28541] in Source-Commits
moira commit: Rename and update build instructions
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jun 29 16:24:51 2015
Date: Mon, 29 Jun 2015 16:24:49 -0400
From: Jonathan D Reed <jdreed@mit.edu>
Message-Id: <201506292024.t5TKOn6f030631@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/moira/commit/736a7c2a1f43346a67dbdd11970961f44254c5be
commit 736a7c2a1f43346a67dbdd11970961f44254c5be
Author: Jonathan Reed <jdreed@mit.edu>
Date: Mon Jun 29 16:15:18 2015 -0400
Rename and update build instructions
- 00README is a stupid name
- Update the build instructions for the brave new Git world
00README | 50 --------------------------------------------------
BUILDING.debathena | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/00README b/00README
deleted file mode 100644
index 7c44b34..0000000
--- a/00README
+++ /dev/null
@@ -1,50 +0,0 @@
-Importing a new Moira snapshot:
-
-0) Run "svn up" to ensure your copy of the Athena source is up to date.
-
-1) In a scratch directory, checkout trunk/moira from the moira repository:
-
- svn co svn+ssh://svn.mit.edu/moira/trunk/moira moira
-
-2) Make a note of the latest moira revision number (from svn info)
-
-3) cd to a checkout of trunk/third/moira in the athena repo
-
-4) Copy the latest moira checkout into your working copy of the athena
- source. You'll need to use something that won't copy over the SVN
- metadata. My preference is for rsync.
-
- ~/src/athena/third/moira$ rsync -avzC /path/to/moira/checkout/ .
-
- Consider adding "-n" to rsync's arguments to try it with a dry-run
- first.
-
-5) Sanity check the copy to ensure you didn't omit the trailing slash
- and thus copy the moira subdirectory itself, instead of its contents.
-
-6) Run "svn status" to sanity-check what changed. Add any new files
- as necessary, either manually, or with something like the following:
-
- svn status | awk '/^?/ { print $2; }' | xargs svn add
-
- Also, you'll need to delete any files that no longer exist. One
- way to do this (probably not the best way) is to go back to your
- moira working copy, and do a reverse merge of the previous imported
- revision. For example, if the last snapshot was from moira r3987,
- and the current one is r4042:
-
- ~/scratch/moira$ svn merge -r4042:3987 .
-
- Then run "svn status" and looked for _added_ files (it's a reverse
- merge), and those are the files to delete. Or, comb the moirac
- discuss meeting and look for "Removed:" in the commit messages. Or
- do something else.
-
-7) Run "svn diff" and skim the changes to make sure they look reasonable.
-
-8) Edit debian/changelog, and bump the version number, including the
- datestamp and the moira revision number (see step 2).
-
-9) Commit the change.
-
-10) Update these directions if anything has changed.
diff --git a/BUILDING.debathena b/BUILDING.debathena
new file mode 100644
index 0000000..e3d8a3d
--- /dev/null
+++ b/BUILDING.debathena
@@ -0,0 +1,41 @@
+Building Moira:
+
+0) Ensure this repo is up to date and you're on the master branch.
+
+1) Add the Moira repo as a remote (if it's not already):
+
+ git add remote upstream git@github.mit.edu:ops/moira.git
+
+ Clobber the push URL to avoid doing something dumb:
+
+ git remote set-url --push upstream file:///dev/null
+
+2) Fetch master and the tags from upstream:
+
+ git fetch upstream master
+ git fetch upstream <upstream_tag_name_here>
+
+3) Get the new changes:
+
+ cd <root_level_of_moira_submodule>
+ git checkout <upstream_tag_name_here> -- .
+
+4) Make sure they look sane and check them in.
+
+5) Delete the upstream tag. This step is only necessary
+ because upstream is using the same tag names we are.
+
+ git tag -d <upstream_tag_name_here>
+
+6) Tag as you would any non-native package.
+
+7) Checkout debian and merge master into it, ensuring you pass --no-ff
+ to force a merge commit.
+
+8) Make any packaging changes necessary, and update the changelog.
+
+9) Build as you would any non-native package.
+
+[...]
+
+32768) Update these directions if anything has changed.
