3
3
4
4
# set -x
5
5
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`
18
12
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
19
31
fi
20
32
21
33
set -e
22
34
23
- package_name=esp8266-$ver
24
- echo " Version: $ver "
35
+ package_name=esp8266-$visiblever
36
+ echo " Version: $visiblever ( $ ver) "
25
37
echo " Package name: $package_name "
26
38
27
39
# Set REMOTE_URL environment variable to the address where the package will be
@@ -34,7 +46,7 @@ echo "Remote: $REMOTE_URL"
34
46
35
47
if [ -z " $PKG_URL " ]; then
36
48
if [ -z " $PKG_URL_PREFIX " ]; then
37
- PKG_URL_PREFIX=" $REMOTE_URL /versions/$ver "
49
+ PKG_URL_PREFIX=" $REMOTE_URL /versions/$visiblever "
38
50
fi
39
51
PKG_URL=" $PKG_URL_PREFIX /$package_name .zip"
40
52
fi
@@ -43,9 +55,9 @@ echo "Docs: $DOC_URL"
43
55
44
56
pushd ..
45
57
# Create directory for the package
46
- outdir=package/versions/$ver /$package_name
58
+ outdir=package/versions/$visiblever /$package_name
47
59
srcdir=$PWD
48
- rm -rf package/versions/$ver
60
+ rm -rf package/versions/$visiblever
49
61
mkdir -p $outdir
50
62
51
63
# Some files should be excluded from the package
@@ -96,7 +108,7 @@ echo \#define ARDUINO_ESP8266_RELEASE_$ver_define >>$outdir/cores/esp8266/core_v
96
108
echo \# define ARDUINO_ESP8266_RELEASE \" $ver_define \" >> $outdir /cores/esp8266/core_version.h
97
109
98
110
# Zip the package
99
- pushd package/versions/$ver
111
+ pushd package/versions/$visiblever
100
112
echo " Making $package_name .zip"
101
113
zip -qr $package_name .zip $package_name
102
114
rm -rf $package_name
@@ -109,7 +121,7 @@ echo SHA-256: $sha
109
121
110
122
echo " Making package_esp8266com_index.json"
111
123
112
- jq_arg=" .packages[0].platforms[0].version = \" $ver \" | \
124
+ jq_arg=" .packages[0].platforms[0].version = \" $visiblever \" | \
113
125
.packages[0].platforms[0].url = \" $PKG_URL \" |\
114
126
.packages[0].platforms[0].archiveFileName = \" $package_name .zip\" "
115
127
0 commit comments