Skip to content

Commit c3f9b6b

Browse files
committed
Re-enabled OS X builds in Release Process docs.
OS X Gitian builds should work now, so there's no reason to exclude them from the Release Process docs.
1 parent 4cd859c commit c3f9b6b

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

doc/release-process.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Ensure gitian-builder is up-to-date:
8888
wget -P inputs http://downloads.sourceforge.net/project/osslsigncode/osslsigncode/osslsigncode-1.7.1.tar.gz
8989
popd
9090

91-
( **Not in Namecoin yet.** ) Create the OS X SDK tarball, see the [OS X readme](README_osx.md) for details, and copy it into the inputs directory.
91+
Create the OS X SDK tarball, see the [OS X readme](README_osx.md) for details, and copy it into the inputs directory.
9292

9393
### Optional: Seed the Gitian sources cache and offline git repositories
9494

@@ -120,8 +120,6 @@ The gbuild invocations below <b>DO NOT DO THIS</b> by default.
120120
mv build/out/namecoin-*-win-unsigned.tar.gz inputs/namecoin-win-unsigned.tar.gz
121121
mv build/out/namecoin-*.zip build/out/namecoin-*.exe ../
122122

123-
( **OS X is not in Namecoin yet.** )
124-
125123
./bin/gbuild --num-make 2 --memory 3000 --commit namecoin=nc${VERSION} ../namecoin-core/contrib/gitian-descriptors/gitian-osx.yml
126124
./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../namecoin-core/contrib/gitian-descriptors/gitian-osx.yml
127125
mv build/out/namecoin-*-osx-unsigned.tar.gz inputs/namecoin-osx-unsigned.tar.gz
@@ -133,7 +131,7 @@ Build output expected:
133131
1. source tarball (`namecoin-${VERSION}.tar.gz`)
134132
2. linux 32-bit and 64-bit dist tarballs (`namecoin-${VERSION}-linux[32|64].tar.gz`)
135133
3. windows 32-bit and 64-bit unsigned installers and dist zips (`namecoin-${VERSION}-win[32|64]-setup-unsigned.exe`, `namecoin-${VERSION}-win[32|64].zip`)
136-
4. ( **Not in Namecoin yet.** ) OS X unsigned installer and dist tarball (`namecoin-${VERSION}-osx-unsigned.dmg`, `namecoin-${VERSION}-osx64.tar.gz`)
134+
4. OS X unsigned installer and dist tarball (`namecoin-${VERSION}-osx-unsigned.dmg`, `namecoin-${VERSION}-osx64.tar.gz`)
137135
5. Gitian signatures (in `gitian.sigs/${VERSION}-<linux|{win,osx}-unsigned>/(your Gitian key)/`)
138136

139137
### Verify other gitian builders signatures to your own. (Optional)
@@ -148,7 +146,7 @@ Verify the signatures
148146
pushd ./gitian-builder
149147
./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-linux ../namecoin-core/contrib/gitian-descriptors/gitian-linux.yml
150148
./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../namecoin-core/contrib/gitian-descriptors/gitian-win.yml
151-
#./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../namecoin-core/contrib/gitian-descriptors/gitian-osx.yml # OS X is not in Namecoin yet, so don't do this.
149+
./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../namecoin-core/contrib/gitian-descriptors/gitian-osx.yml
152150
popd
153151

154152
### Next steps:
@@ -158,7 +156,7 @@ Commit your signature to gitian.sigs:
158156
pushd gitian.sigs
159157
git add ${VERSION}-linux/${SIGNER}
160158
git add ${VERSION}-win-unsigned/${SIGNER}
161-
#git add ${VERSION}-osx-unsigned/${SIGNER} # OS X is not in Namecoin yet, so don't do this.
159+
git add ${VERSION}-osx-unsigned/${SIGNER}
162160
git commit -a
163161
git push # Assuming you can push to the gitian.sigs tree
164162
popd
@@ -243,8 +241,8 @@ namecoin-${VERSION}-aarch64-linux-gnu.tar.gz
243241
namecoin-${VERSION}-arm-linux-gnueabihf.tar.gz
244242
namecoin-${VERSION}-i686-pc-linux-gnu.tar.gz
245243
namecoin-${VERSION}-x86_64-linux-gnu.tar.gz
246-
namecoin-${VERSION}-osx64.tar.gz # Not in Namecoin yet.
247-
namecoin-${VERSION}-osx.dmg # Not in Namecoin yet.
244+
namecoin-${VERSION}-osx64.tar.gz
245+
namecoin-${VERSION}-osx.dmg
248246
namecoin-${VERSION}.tar.gz
249247
namecoin-${VERSION}-win32-setup.exe
250248
namecoin-${VERSION}-win32.zip

0 commit comments

Comments
 (0)