Skip to content

Commit 6133353

Browse files
committed
Update release script
1 parent 700bbbe commit 6133353

File tree

2 files changed

+38
-22
lines changed

2 files changed

+38
-22
lines changed

scripts/docker-release.sh

+16-21
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,42 @@ set -xeo pipefail
33
shopt -s expand_aliases
44

55
docker_name=shesek/bwt
6-
76
version=$(grep -E '^version =' Cargo.toml | cut -d'"' -f2)
87
base_tag=$docker_name:$version
98

10-
docker_name=shesek/bwt-test
11-
base_tag=$docker_name:$version
12-
139
build_variant() {
1410
local docker_tag=$1
1511
local docker_alias=$2
12+
local features=$3
13+
local bin_variant=$4
1614

17-
build $1-amd64 $2-amd64 $3 "$4" x86_64-linux Dockerfile
18-
build $1-arm32v7 $2-arm32v7 $3 "$4" arm32v7-linux arm32v7.Dockerfile
19-
build $1-arm64v8 $2-arm64v8 $3 "$4" arm64v8-linux arm64v8.Dockerfile
15+
build $1-amd64 $features "$bin_variant" x86_64-linux Dockerfile
16+
build $1-arm32v7 $features "$bin_variant" arm32v7-linux arm32v7.Dockerfile
17+
build $1-arm64v8 $features "$bin_variant" arm64v8-linux arm64v8.Dockerfile
2018

2119
# can't tag manifests to create an alias, need to create them separately instead
2220
for target in $docker_tag $docker_alias; do
23-
docker manifest create --amend $target $docker_tag-amd64 $docker_tag-arm32v7 $docker_tag-arm64v8
24-
docker manifest annotate $target $docker_tag-amd64 --os linux --arch amd64
25-
docker manifest annotate $target $docker_tag-arm32v7 --os linux --arch arm --variant v7
26-
docker manifest annotate $target $docker_tag-arm64v8 --os linux --arch arm64 --variant v8
27-
docker manifest push $target -p
21+
docker manifest create --amend $target $docker_tag-amd64 $docker_tag-arm32v7 $docker_tag-arm64v8
22+
docker manifest annotate $target $docker_tag-amd64 --os linux --arch amd64
23+
docker manifest annotate $target $docker_tag-arm32v7 --os linux --arch arm --variant v7
24+
docker manifest annotate $target $docker_tag-arm64v8 --os linux --arch arm64 --variant v8
25+
docker manifest push $target -p
2826
done
2927
}
3028

3129
build() {
3230
local docker_tag=$1
33-
local docker_alias=$2
34-
local features=$3
35-
local bin_variant=$4
36-
local bin_platform=$5
37-
local dockerfile=$6
31+
local features=$2
32+
local bin_variant=$3
33+
local bin_platform=$4
34+
local dockerfile=$5
3835

3936
docker build -t $docker_tag --build-arg FEATURES=$features \
4037
--build-arg PREBUILT_BIN=dist/bwt-$version$bin_variant-$bin_platform/bwt \
4138
-f docker/$dockerfile .
4239

43-
docker tag $docker_tag $docker_alias
4440
docker push $docker_tag
45-
docker push $docker_alias
4641
}
4742

48-
build_variant $base_tag $docker_name:latest http,electrum,webhooks,track-spends ''
49-
build_variant $base_tag-electrum $docker_name:electrum electrum '-electrum_only'
43+
build_variant $base_tag $docker_name:latest http,electrum,webhooks,track-spends ''
44+
build_variant $base_tag-electrum $docker_name:electrum electrum '-electrum_only'

scripts/release.sh

+22-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ if ! git diff-index --quiet HEAD; then
1010
exit 1
1111
fi
1212

13+
if [ -z "$BWT_BASE" ]; then
14+
echo >&2 BWT_BASE is required
15+
exit 1
16+
fi
17+
1318
version=$(grep -E '^version =' Cargo.toml | cut -d'"' -f2)
1419

1520
if [[ "$1" == "patch" ]]; then
@@ -61,7 +66,6 @@ if [ -z "$SKIP_BUILD" ]; then
6166
(cd dist && sha256sum *.{tar.gz,zip}) | sort | gpg --clearsign --digest-algo sha256 > SHA256SUMS.asc
6267
fi
6368

64-
6569
if [ -z "$SKIP_GIT" ]; then
6670
echo Tagging...
6771
git add Cargo.{toml,lock} CHANGELOG.md SHA256SUMS.asc README.md
@@ -109,3 +113,20 @@ if [ -z "$SKIP_DOCKER" ]; then
109113
echo Releasing docker images...
110114
./scripts/docker-release.sh
111115
fi
116+
117+
if [ -z "$SKIP_SUBPROJECTS" ]; then
118+
export BWT_COMMIT=$(git rev-parse HEAD)
119+
120+
echo '## Releasing libbwt'
121+
(cd $BWT_BASE/libbwt && ./scripts/release.sh)
122+
123+
echo '## Releasing libbwt-jni'
124+
(cd $BWT_BASE/libbwt-jni && ./scripts/release.sh)
125+
126+
echo '## Releasing bwt-electrum-plugin'
127+
(cd $BWT_BASE/bwt-electrum-plugin && ./scripts/release.sh)
128+
129+
echo '## Releasing libbwt-nodejs'
130+
export LIBBWT_COMMIT=$(cd $BWT_BASE/libbwt && git rev-parse HEAD)
131+
(cd $BWT_BASE/libbwt-nodejs && ./scripts/release.sh)
132+
fi

0 commit comments

Comments
 (0)