Skip to content

Commit

Permalink
Merge branch 'master' into cboulanger-variables-as-json
Browse files Browse the repository at this point in the history
  • Loading branch information
hkollmann committed Jul 2, 2019
2 parents 6996dc7 + 4a6a729 commit 23fbea5
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 4 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@
# WebStorm
/.idea

# Build & test infrastructur
# Build & test infrastructure
/build.log
/lib
/compiled
/apps
/deploy
/build
/qx_packages

# CSS compiler
/framework/source/resource/qx/mobile/scss/.sass-cache/
Expand All @@ -37,4 +40,4 @@
node_modules/
npm-debug.log

/qx_packages

3 changes: 1 addition & 2 deletions .pullapprove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ groups:
- "not (files.exclude('docs/*') and files.exclude('documentation/*') and files.exclude('*.md'))"
reviews:
required: 2 # 2 approvals from this group are required
request: 2 # 2 review request will be sent at a time
request_order: shuffle # reviewers will be chosen in a random order
request: 5 # 5 review request will be sent at a time
reviewers:
teams:
- pr-mergers
Expand Down
24 changes: 24 additions & 0 deletions .travis/build-site-v6
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
#
# This builds the new v6 website documentation and apps
#

set -o errexit -o nounset

exe() { echo "\$ ${@/eval/}" ; "$@" ; }

TARGET=deploy/$(cat ./version.txt)
mkdir -p $TARGET

[ -d ./node_modules/@qooxdoo/compiler ] || npm i --no-save @qooxdoo/compiler

# build apps (unless already built) & copy to website target
[ -d ./apps/resource ] || exe npx qx compile compile.json --target build --feedback=0
exe cp -a ./apps $TARGET
exe find $TARGET -type f -name '*.map' -delete
exe find $TARGET -type f -name '*.json' -delete
exe find $TARGET -type f -name '.*' -delete
exe rm -rf $TARGET/transpiled

# copy documentation
exe cp -a ./docs $TARGET/
1 change: 1 addition & 0 deletions .travis/deploy
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ fi
cd $TRAVIS_BUILD_DIR
.travis/make-release-sdk
.travis/build-site
.travis/build-site-v6

cd deploy
rm -rf "$TARGET" &> /dev/null
Expand Down
4 changes: 4 additions & 0 deletions apps/.npmignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
transpiled
db.json
resource-db.json
versions.json
build-data.json

0 comments on commit 23fbea5

Please sign in to comment.