Compare commits

...

7 Commits

Author SHA1 Message Date
Peli de Halleux
82c1717c4c 0.8.31 2017-03-08 04:17:33 -08:00
Peli de Halleux
d46748cd5a updated pxt reference 2017-03-08 04:17:18 -08:00
Peli de Halleux
d4197e2eb1 pointing to 0.8.30 2017-02-28 07:24:49 -08:00
Peli de Halleux
1514458823 0.8.30 2017-02-28 07:17:12 -08:00
Peli de Halleux
da72b09750 updated branch detection 2017-02-28 07:17:01 -08:00
Peli de Halleux
437ebb4fad 0.8.29 2017-02-28 07:07:22 -08:00
Peli de Halleux
b7c8709424 support for v0 branch build 2017-02-28 07:07:11 -08:00
4 changed files with 7 additions and 6 deletions

View File

@@ -1,3 +1,3 @@
{
"appref": "v0.8.26"
"appref": "v0.8.30"
}

View File

@@ -13,6 +13,7 @@ echo isPR: $1
originRegex="^origin/.*"
branchRegex="^origin/\K.*(?=$)"
releaseBranchRegex = "^(master|v\d+)$"
if [[ "$GIT_BRANCH" =~ $originRegex ]]; then
branchName=$(echo ${GIT_BRANCH} | grep -oP $branchRegex)
@@ -27,7 +28,7 @@ if [ "$1" == "false" ]; then
echo Setting TRAVIS_PULL_REQUEST to false
export TRAVIS_PULL_REQUEST=false
if [ $TRAVIS_BRANCH == "master" ]; then
if [[ "$TRAVIS_BRANCH" =~ $releaseBranchRegex ]]; then
if [[ -z $PXT_RELEASE_REPO ]]; then
echo Cannot find release repo; skipping tag checks
else

View File

@@ -1,6 +1,6 @@
{
"name": "pxt-calliope",
"version": "0.8.28",
"version": "0.8.31",
"description": "Calliope Mini editor for PXT",
"keywords": [
"JavaScript",
@@ -34,7 +34,7 @@
"semantic-ui-less": "^2.2.4"
},
"dependencies": {
"pxt-core": "0.11.55"
"pxt-core": "0.11.66"
},
"scripts": {
"test": "node node_modules/pxt-core/built/pxt.js travis"

View File

@@ -195,8 +195,8 @@
"termsOfUseUrl": "https://go.microsoft.com/fwlink/?LinkID=206977",
"githubUrl": "https://github.com/Microsoft/pxt-calliope",
"crowdinProject": "kindscript",
"organization": "Microsoft",
"organizationUrl": "https://pxt.io/",
"organization": "Microsoft MakeCode",
"organizationUrl": "https://makecode.com/",
"organizationLogo": "./static/Microsoft-logo_rgb_c-gray-square.png",
"organizationWideLogo": "./static/Microsoft-logo_rgb_c-white.png",
"browserSupport": [