Skip to content

Commit 89c7991

Browse files
committed
prepare alpha channel release builder
1 parent 215459f commit 89c7991

File tree

1 file changed

+31
-19
lines changed

1 file changed

+31
-19
lines changed

package/build_boards_manager_package.sh

+31-19
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,37 @@
33

44
#set -x
55

6-
# Extract next version from platform.txt
7-
next=`sed -n -E 's/version=([0-9.]+)/\1/p' ../platform.txt`
8-
9-
# Figure out how will the package be called
10-
ver=`git describe --exact-match`
11-
if [ $? -ne 0 ]; then
12-
# not tagged version; generate nightly package
13-
date_str=`date +"%Y%m%d"`
14-
is_nightly=1
15-
plain_ver="${next}-nightly"
16-
ver="${plain_ver}+${date_str}"
17-
else
6+
ver=`git describe --tag`
7+
visiblever=$ver
8+
if [ "$ver" = 0.0.1 ]; then
9+
10+
git tag -d 0.0.1
11+
ver=`git describe --tag HEAD`
1812
plain_ver=$ver
13+
14+
else
15+
16+
# Extract next version from platform.txt
17+
next=`sed -n -E 's/version=([0-9.]+)/\1/p' ../platform.txt`
18+
19+
# Figure out how will the package be called
20+
ver=`git describe --exact-match`
21+
if [ $? -ne 0 ]; then
22+
# not tagged version; generate nightly package
23+
date_str=`date +"%Y%m%d"`
24+
is_nightly=1
25+
plain_ver="${next}-nightly"
26+
ver="${plain_ver}+${date_str}"
27+
else
28+
plain_ver=$ver
29+
fi
30+
visiblever=$ver
1931
fi
2032

2133
set -e
2234

23-
package_name=esp8266-$ver
24-
echo "Version: $ver"
35+
package_name=esp8266-$visiblever
36+
echo "Version: $visiblever ($ver)"
2537
echo "Package name: $package_name"
2638

2739
# Set REMOTE_URL environment variable to the address where the package will be
@@ -34,7 +46,7 @@ echo "Remote: $REMOTE_URL"
3446

3547
if [ -z "$PKG_URL" ]; then
3648
if [ -z "$PKG_URL_PREFIX" ]; then
37-
PKG_URL_PREFIX="$REMOTE_URL/versions/$ver"
49+
PKG_URL_PREFIX="$REMOTE_URL/versions/$visiblever"
3850
fi
3951
PKG_URL="$PKG_URL_PREFIX/$package_name.zip"
4052
fi
@@ -43,9 +55,9 @@ echo "Docs: $DOC_URL"
4355

4456
pushd ..
4557
# Create directory for the package
46-
outdir=package/versions/$ver/$package_name
58+
outdir=package/versions/$visiblever/$package_name
4759
srcdir=$PWD
48-
rm -rf package/versions/$ver
60+
rm -rf package/versions/$visiblever
4961
mkdir -p $outdir
5062

5163
# Some files should be excluded from the package
@@ -96,7 +108,7 @@ echo \#define ARDUINO_ESP8266_RELEASE_$ver_define >>$outdir/cores/esp8266/core_v
96108
echo \#define ARDUINO_ESP8266_RELEASE \"$ver_define\" >>$outdir/cores/esp8266/core_version.h
97109

98110
# Zip the package
99-
pushd package/versions/$ver
111+
pushd package/versions/$visiblever
100112
echo "Making $package_name.zip"
101113
zip -qr $package_name.zip $package_name
102114
rm -rf $package_name
@@ -109,7 +121,7 @@ echo SHA-256: $sha
109121

110122
echo "Making package_esp8266com_index.json"
111123

112-
jq_arg=".packages[0].platforms[0].version = \"$ver\" | \
124+
jq_arg=".packages[0].platforms[0].version = \"$visiblever\" | \
113125
.packages[0].platforms[0].url = \"$PKG_URL\" |\
114126
.packages[0].platforms[0].archiveFileName = \"$package_name.zip\""
115127

0 commit comments

Comments
 (0)