Skip to content

Commit

Permalink
Merge branch 'master' into paid-feature-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
mazameli authored Sep 18, 2018
2 parents f3fe6ae + 4be5abb commit d2fe52b
Show file tree
Hide file tree
Showing 887 changed files with 76,553 additions and 18,513 deletions.
588 changes: 588 additions & 0 deletions .circleci/config.yml

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions .circleci/skip-driver-tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env bash

# Determines whether we should skip tests for a driver, usage:
#
# ./.circleci/skip-driver-tests.sh oracle
#
# Returns false if the commit message contains [ci all], [ci drivers], or [ci <driver-name>],
# or if the current branch is master or a release branch.

set -eu

COMMIT_MESSAGE=`git log -1 --oneline`

! [[ "$CIRCLE_BRANCH" =~ ^master|release-.+$ ]] &&
! [[ "$COMMIT_MESSAGE" == *"[ci all]"* ]] &&
! [[ "$COMMIT_MESSAGE" == *"[ci drivers]"* ]] &&
! [[ "$COMMIT_MESSAGE" == *"[ci $1]"* ]] &&
echo "Skipping driver tests: $1"
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"react/no-did-update-set-state": 0,
"react/no-find-dom-node": 0,
"flowtype/define-flow-type": 1,
"flowtype/use-flow-type": 1
"flowtype/use-flow-type": 1,
"no-color-literals": 1
},
"globals": {
"pending": false
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,4 @@ coverage-summary.json
bin/node_modules/
*.log
*.trace.db
/backend-checksums.txt
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# STAGE 1: builder
###################

FROM java:openjdk-8-jre-alpine as builder
FROM openjdk:8-jdk-alpine as builder

WORKDIR /app/source

Expand All @@ -14,7 +14,8 @@ ENV LC_CTYPE en_US.UTF-8
# git: ./bin/version
# nodejs: frontend building
# make: backend building
RUN apk add --update bash nodejs git wget make
# gettext: translations
RUN apk add --update bash nodejs nodejs-npm git wget make gettext

# yarn: frontend dependencies
RUN npm install -g yarn
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ To get started with a development installation of the Metabase, follow the instr

Then take a look at our [Contribution Guide](docs/contributing.md) for information about our process and where you can fit in!

Talk to other contributors [in our Gitter room](https://gitter.im/metabase/metabase).
Talk to other contributors [in our Gitter room](https://gitter.im/metabase/metabase).

# Internationalization
We want Metabase to be avaliable in as many languages as possible. See what translations are avaliable and help contribute to internationalization using our project [over at POEditor](https://poeditor.com/join/project/ynjQmwSsGh)

# Extending and Deep Integrations

Expand Down
16 changes: 15 additions & 1 deletion bin/build
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,25 @@ frontend-deps() {
}

frontend() {
frontend-deps
echo "Running 'webpack' with NODE_ENV=production assemble and minify frontend assets..." &&
NODE_ENV=production ./node_modules/.bin/webpack --bail
}

frontend-fast() {
frontend-deps
echo "Running 'webpack' with NODE_ENV=development to assemble frontend assets..." &&
NODE_ENV=development ./node_modules/.bin/webpack --bail --devtool eval
}

translations() {
echo "Running './bin/i18n/build-translation-resources' to build translation resources..."
if ! ./bin/i18n/build-translation-resources; then
echo "Building translation resources failed, please install 'gettext', or build without translations by running './bin/build no-translations'."
exit 1
fi
}

sample-dataset() {
if [ -f resources/sample-dataset.db.mv.db ]; then
echo "Sample Dataset already generated."
Expand All @@ -44,7 +54,11 @@ uberjar() {
}

all() {
version && frontend-deps && frontend && sample-dataset && uberjar
version && translations && frontend && sample-dataset && uberjar
}

no-translations() {
version && frontend && sample-dataset && uberjar
}

# Default to running all but let someone specify one or more sub-tasks to run instead if desired
Expand Down
282 changes: 0 additions & 282 deletions bin/ci

This file was deleted.

Loading

0 comments on commit d2fe52b

Please sign in to comment.