Skip to content

Commit

Permalink
release 8.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
blackart committed Jul 10, 2018
1 parent a8595b7 commit 0240a19
Show file tree
Hide file tree
Showing 180 changed files with 22,169 additions and 17,863 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,6 +1,7 @@
.DS_Store
*.swp
.idea
.vscode
*.pid
/libs/compiler/
out/*
Expand Down
4 changes: 2 additions & 2 deletions bin/deploy_release.sh
Expand Up @@ -101,7 +101,7 @@ fi
#
########################################################################################################################

indexDTSurl="https://api.anychart.com/si/${VERSION}/index-${VERSION}.d.ts"
indexDTSurl="http://api.anychart.stg/si/${VERSION}/index.d.ts"
if $IS_RC; then indexDTSurl='http://api.anychart.stg/si/develop/index-develop.d.ts'; fi

echo
Expand Down Expand Up @@ -192,7 +192,7 @@ else

echo
echo ' -- create tag'
run "git tag v{$VERSION}"
run "git tag v$VERSION"

echo
echo " -- push tags befor branch (travis' issue)"
Expand Down
9 changes: 8 additions & 1 deletion bin/sources/modules.json
Expand Up @@ -179,7 +179,8 @@
"stock": {
"entry": "anychart.stockModule.entry",
"deps": [
"core"
"core",
"color-scales"
]
},
"table": {
Expand Down Expand Up @@ -661,6 +662,8 @@
"docs": "https://docs.anychart.com/Stock_Charts/",
"icon": "/_design/img/upload/charts/types/stock-chart.svg",
"parts": [
"color-scales",
"theme-color-scales",
"stock",
"theme-stock"
]
Expand Down Expand Up @@ -694,6 +697,8 @@
"docs": "",
"icon": "/_design/img/upload/charts/types/area-chart.svg",
"parts": [
"color-scales",
"theme-color-scales",
"cartesian",
"theme-cartesian"
]
Expand All @@ -705,6 +710,8 @@
"docs": "https://docs.anychart.com/Basic_Charts/Scatter_Plot/",
"icon": "/_design/img/upload/charts/types/dot-marker-chart.svg",
"parts": [
"color-scales",
"theme-color-scales",
"cartesian",
"theme-cartesian",
"scatter",
Expand Down
4 changes: 3 additions & 1 deletion bin/travis/build.sh
Expand Up @@ -24,7 +24,7 @@ VERSION=''

#### Set Steps
STEP_CHECK_VARIABLES=false
STEP_BUILD_DIST=true
STEP_BUILD_DIST=false
STEP_UPLOAD_STATIC=true
STEP_DROP_CDN=true

Expand All @@ -45,6 +45,8 @@ if [ "${TRAVIS_BRANCH}" = "master" ] || [ ${DRY_RUN_RELEASE} ]; then
STEP_NPM_RELEASE=false
STEP_GIT_RELEASE=true

STEP_BUILD_DIST=false

STEP_EXPORT_SERVER=true
STEP_DOWNLOAD_EXTERNAL=true

Expand Down
2 changes: 2 additions & 0 deletions bin/travis/steps/check_vars.sh
Expand Up @@ -19,7 +19,9 @@ function check_variables(){
exit 1
fi

echo "check NPM"
npm_check_variables
echo "check GIT"
git_check_variables

# used to create latest build
Expand Down
4 changes: 2 additions & 2 deletions bin/travis/steps/export_server.sh
Expand Up @@ -30,12 +30,12 @@ function es_clone_and_build(){

function build_export_server(){

es_clone_and_build "https://github.com/AnyChart/export-server.git"
es_clone_and_build "git@github.com:AnyChart/export-server.git"

Run "scp -i ~/.ssh/id_rsa out/export-server/target/export-server-standalone.jar $STATIC_HOST_SSH_STRING:/apps/static/cdn/releases/${VERSION}/anychart-export-server-${VERSION}.jar"
Run "rm -rf out/export-server"

es_clone_and_build "https://github.com/AnyChart/export-server-private.git"
es_clone_and_build "git@github.com:AnyChart/export-server-private.git"
Run "rm -rf out/export-server"

echo
Expand Down
3 changes: 2 additions & 1 deletion bin/travis/steps/git_release.sh
Expand Up @@ -11,7 +11,8 @@ function git_release(){
echo "--"
echo Publishing GIT release
echo "--"

pwd

Run "python ./bin/travis/utils/upload_github_release.py ${GITHUB_TOKEN}"
echo

Expand Down
3 changes: 2 additions & 1 deletion bin/travis/utils/mock.sh
Expand Up @@ -15,8 +15,9 @@ fi

Run ()
{
echo "$*"

if [ ${DRY_RUN} ] && [ ${DRY_RUN} -eq 1 ]; then
echo "$*"
return 0
fi

Expand Down
2 changes: 1 addition & 1 deletion bin/travis/utils/upload_github_release.py
Expand Up @@ -5,7 +5,7 @@
import os
import sys

PROJECT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
PROJECT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..','..','..'))
VERSION_INI_PATH = os.path.join(PROJECT_PATH, 'version.ini')


Expand Down
1 change: 0 additions & 1 deletion build.py
Expand Up @@ -802,7 +802,6 @@ def __get_bundle_wrapper(bundle_name, modules, file_name='', performance_monitor

branch_name = __get_current_branch_name()
date_mask = '%Y-%m-%d' #if branch_name == 'master' else '%Y-%m-%d %H:%M'

start = start % (
', '.join(modules),
__get_build_version(),
Expand Down

0 comments on commit 0240a19

Please sign in to comment.