summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xintro4
-rw-r--r--release.txt21
-rwxr-xr-xstage6
3 files changed, 23 insertions, 8 deletions
diff --git a/intro b/intro
index 6deafe3..6587f37 100755
--- a/intro
+++ b/intro
@@ -44,7 +44,11 @@ toolchain=
hello2=hello/hello2
show=n
prompt=-y
+
+# Add for both build2.org and stage.build2.org.
+#
trust="--trust FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30:56:B9:77:B9:F2:01:94"
+trust+=" --trust 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65"
c1=g++-5
c2=clang++-3.6
diff --git a/release.txt b/release.txt
index 5bdead3..fad7f9a 100644
--- a/release.txt
+++ b/release.txt
@@ -1,5 +1,7 @@
@@ No upgrade testing
+- Add new bot machines/configurations/options from stage to queue to public
+
- Replace 0.5.0 and 0.5 in this document with the new version.
- Remove etc/ and private/ from modules in etc/git/modules to reduce
@@ -27,7 +29,9 @@
cd ..
etc/intro -s `pwd`/hello/repository/1/
- etc/intro -s https://build2.org/pkg/1/stage
+ etc/intro -s https://hello.stage.build2.org/1
+
+ - Make sure all the bot builds are successful (drop build db).
- Update NEWS files in all project that will have non-pre-release version.
@@ -38,9 +42,10 @@
- Install guide for (for 1 & 2).
- - Introduction for (for 1 & 2). Use intro script to get output:
+ - Introduction for (for 1 & 2). Use intro script to get output but watch
+ out for stage (grep afterwards):
- etc/intro -s -p https://build2.org/pkg/1/stage
+ etc/intro -s -p https://hello.stage.build2.org/1
- Change to final versions for all packages being released, some by hand,
some with version scripts (see etc/stage for list + msvc-linux).
@@ -174,10 +179,12 @@
- Write and send the announcement to mailing lists.
- Remember upgrade instructions.
-
cat `ls -1 *.sha256`
+ - Remember upgrade instructions.
+
+ - Add reply-to: header for users@ announcement.
+
- Patch the announcement URL in release notes, re-publish.
- Announce on reddit and other places (see doc/ann/).
@@ -255,3 +262,7 @@
- Commit and tag
git tag -a 0.5.0 -m "Tag version 0.5.0" && git push --tags
+
+- Snapshot buildos-5 subvolume as buildos-5-0.5.0
+
+ btrfs subvolume snapshot buildos-5 buildos-5-0.5.0
diff --git a/stage b/stage
index 901f8a0..6e664de 100755
--- a/stage
+++ b/stage
@@ -154,13 +154,13 @@ rsync -v -rlpt -c --copy-unsafe-links --prune-empty-dirs --delete-after \
etc/stage-pkg -c $mode -d apr packaging/apr/libapr1
etc/stage-pkg -c $mode -d postgresql packaging/postgresql/libpq
-etc/stage-pkg $mode -d sqlite \
+etc/stage-pkg -c $mode -d sqlite \
packaging/sqlite/libsqlite3 \
packaging/sqlite/sqlite3
-etc/stage-pkg $mode -d studxml ../studxml/libstudxml
+etc/stage-pkg -c $mode -d studxml ../studxml/libstudxml
-etc/stage-pkg $mode -d odb \
+etc/stage-pkg -c $mode -d odb \
../odb/builds/default/libodb \
../odb/builds/default/libodb-sqlite \
../odb/builds/default/libodb-pgsql