From fd080291e41159a00873543a66d2791628a5d558 Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 21:42:07 -0300 Subject: [PATCH 01/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d1e18a..e1b8d87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,6 @@ install: deploy: provider: pages github_token: $GITHUB_TOKEN - local_dir: build_production - repo: xprototype/skeleton-quasar target_branch: master keep-history: true on: From cf56f2026df1cc620f7670763720bcd0af3bde6d Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 21:47:16 -0300 Subject: [PATCH 02/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e1b8d87..dd15107 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ node_js: install: - npm install --global @vue/cli@3.4.1 @vue/cli-init@3.4.1 - npm install --global @quasar/cli@1.0.0-beta.3 - - yarn install + - npm install deploy: provider: pages github_token: $GITHUB_TOKEN From 257f0d203998acd40c32fd7e4ab7a5c65dcd918f Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 21:53:56 -0300 Subject: [PATCH 03/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd15107..48a851d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,24 @@ language: javascript node_js: - 10 +cache: + yarn: true + npm: true + +before_install: + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version version-number + - export PATH="$HOME/.yarn/bin:$PATH" install: - npm install --global @vue/cli@3.4.1 @vue/cli-init@3.4.1 - npm install --global @quasar/cli@1.0.0-beta.3 - - npm install + - yarn install + +script: + - quasar build -m spa + - rm -rf ./docs/* + - cp -R ./dist/spa/* ./docs + deploy: provider: pages github_token: $GITHUB_TOKEN @@ -13,5 +26,3 @@ deploy: keep-history: true on: branch: master - -script: ./quasar.build.sh From a269c7452866d7b10140b1346ebc3dd3868f6ddb Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 21:57:11 -0300 Subject: [PATCH 04/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48a851d..e084971 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,17 +2,12 @@ language: javascript node_js: - 10 cache: - yarn: true npm: true -before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version version-number - - export PATH="$HOME/.yarn/bin:$PATH" - install: - npm install --global @vue/cli@3.4.1 @vue/cli-init@3.4.1 - npm install --global @quasar/cli@1.0.0-beta.3 - - yarn install + - npm install script: - quasar build -m spa From 3b8854be3a1715865993d658482981d91f74f9b9 Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 22:06:20 -0300 Subject: [PATCH 05/18] [#17/feature] Use travis to update docs and publish app --- .travis.sh | 5 +++++ .travis.yml | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100755 .travis.sh diff --git a/.travis.sh b/.travis.sh new file mode 100755 index 0000000..b5401c3 --- /dev/null +++ b/.travis.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +quasar build -m spa +rm -rf ./docs/* +cp -R ./dist/spa/* ./docs diff --git a/.travis.yml b/.travis.yml index e084971..1e0af35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,7 @@ install: - npm install script: - - quasar build -m spa - - rm -rf ./docs/* - - cp -R ./dist/spa/* ./docs + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./travis.sh; fi' deploy: provider: pages From e08cf7c686cebe7540f1420f7baae04a7daada4d Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 22:06:32 -0300 Subject: [PATCH 06/18] [#17/feature] Use travis to update docs and publish app --- .travis.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index b5401c3..ac21557 100755 --- a/.travis.sh +++ b/.travis.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -quasar build -m spa +echo pwd +quasar build rm -rf ./docs/* cp -R ./dist/spa/* ./docs From 32bcb0d3f853593b6c1b7caf4dca874d9ce828e5 Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 22:11:50 -0300 Subject: [PATCH 07/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1e0af35..e29df71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: - npm install script: - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./travis.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./travis.sh; fi' deploy: provider: pages From 05644901df3d89e76a7eb3bf66d4bb26b478a1e4 Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 22:17:49 -0300 Subject: [PATCH 08/18] [#17/feature] Use travis to update docs and publish app --- .travis.sh | 1 - .travis.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index ac21557..b5f15f9 100755 --- a/.travis.sh +++ b/.travis.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -echo pwd quasar build rm -rf ./docs/* cp -R ./dist/spa/* ./docs diff --git a/.travis.yml b/.travis.yml index e29df71..041bc73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ install: - npm install script: + - echo pwd - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./travis.sh; fi' deploy: From 494f32d2b74c2507e639ba0c545d1d67a118fc67 Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 23:50:18 -0300 Subject: [PATCH 09/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 041bc73..ac7ea56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,7 @@ install: - npm install --global @vue/cli@3.4.1 @vue/cli-init@3.4.1 - npm install --global @quasar/cli@1.0.0-beta.3 - npm install - -script: - - echo pwd - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./travis.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./travis.sh; fi' deploy: provider: pages From 504aaa361bcd88ac3b5fd2826f70bfc026ae2970 Mon Sep 17 00:00:00 2001 From: William Correa Date: Sun, 24 Mar 2019 23:56:28 -0300 Subject: [PATCH 10/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ac7ea56..064f903 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ cache: install: - npm install --global @vue/cli@3.4.1 @vue/cli-init@3.4.1 - npm install --global @quasar/cli@1.0.0-beta.3 + - cd $TRAVIS_BUILD_DIR - npm install - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./travis.sh; fi' From 7a9161c5d74cd337700c5dfbdda223476ec1db48 Mon Sep 17 00:00:00 2001 From: William Correa Date: Mon, 25 Mar 2019 00:06:10 -0300 Subject: [PATCH 11/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 064f903..7784fee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,14 @@ language: javascript node_js: - 10 -cache: - npm: true +cache: bundler install: - npm install --global @vue/cli@3.4.1 @vue/cli-init@3.4.1 - npm install --global @quasar/cli@1.0.0-beta.3 - cd $TRAVIS_BUILD_DIR - npm install - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./travis.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash $TRAVIS_BUILD_DIR/travis.sh; fi' deploy: provider: pages From e6db6d14de9efe82b1be9e67af5ffdb0c2ce2f57 Mon Sep 17 00:00:00 2001 From: William Correa Date: Mon, 25 Mar 2019 00:14:16 -0300 Subject: [PATCH 12/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7784fee..b2c0371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,17 @@ language: javascript node_js: - 10 -cache: bundler +cache: + npm: true + directories: + - $TRAVIS_BUILD_DIR install: - npm install --global @vue/cli@3.4.1 @vue/cli-init@3.4.1 - npm install --global @quasar/cli@1.0.0-beta.3 - cd $TRAVIS_BUILD_DIR - npm install - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash $TRAVIS_BUILD_DIR/travis.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash $TRAVIS_BUILD_DIR/.travis.sh; fi' deploy: provider: pages From 7208f40b2327eed80890618fce131cc80a383cbb Mon Sep 17 00:00:00 2001 From: William Correa Date: Mon, 25 Mar 2019 00:26:19 -0300 Subject: [PATCH 13/18] [#17/feature] Use travis to update docs and publish app --- .travis.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.sh b/.travis.sh index b5f15f9..a54f346 100755 --- a/.travis.sh +++ b/.travis.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +cd ${TRAVIS_BUILD_DIR} + quasar build rm -rf ./docs/* cp -R ./dist/spa/* ./docs From 7add86861127b93a821d70e039252c27cb8ff070 Mon Sep 17 00:00:00 2001 From: William Correa Date: Mon, 25 Mar 2019 00:27:35 -0300 Subject: [PATCH 14/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2c0371..208c7b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: javascript node_js: - - 10 + - 11 cache: npm: true directories: From 2db0496a0ffc2de2e2dcffedd4ec4629c4c8227d Mon Sep 17 00:00:00 2001 From: William Correa Date: Mon, 25 Mar 2019 00:38:28 -0300 Subject: [PATCH 15/18] [#17/feature] Use travis to update docs and publish app --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 208c7b8..570649e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ -language: javascript +language: node_js node_js: - - 11 + - "10" cache: npm: true directories: @@ -11,6 +11,8 @@ install: - npm install --global @quasar/cli@1.0.0-beta.3 - cd $TRAVIS_BUILD_DIR - npm install + +script: - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash $TRAVIS_BUILD_DIR/.travis.sh; fi' deploy: From 8477d58b658526fa236190fcb152a1b2c02f62bf Mon Sep 17 00:00:00 2001 From: William Correa Date: Mon, 25 Mar 2019 00:42:21 -0300 Subject: [PATCH 16/18] [#17/feature] Use travis to update docs and publish app --- .travis.sh => .travis.build.sh | 1 + .travis.yml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) rename .travis.sh => .travis.build.sh (78%) diff --git a/.travis.sh b/.travis.build.sh similarity index 78% rename from .travis.sh rename to .travis.build.sh index a54f346..42bb115 100755 --- a/.travis.sh +++ b/.travis.build.sh @@ -2,6 +2,7 @@ cd ${TRAVIS_BUILD_DIR} +cp .env.js.develop .env.js quasar build rm -rf ./docs/* cp -R ./dist/spa/* ./docs diff --git a/.travis.yml b/.travis.yml index 570649e..ad9f857 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,10 @@ cache: install: - npm install --global @vue/cli@3.4.1 @vue/cli-init@3.4.1 - npm install --global @quasar/cli@1.0.0-beta.3 - - cd $TRAVIS_BUILD_DIR - npm install script: - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash $TRAVIS_BUILD_DIR/.travis.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./.travis.build.sh; fi' deploy: provider: pages From 666001f396f1c55757d4252cf49646ea1652539e Mon Sep 17 00:00:00 2001 From: William Correa Date: Mon, 25 Mar 2019 00:49:00 -0300 Subject: [PATCH 17/18] [#17/feature] Use travis to update docs and publish app --- .travis.build.sh => .travis.deploy.sh | 0 .travis.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .travis.build.sh => .travis.deploy.sh (100%) diff --git a/.travis.build.sh b/.travis.deploy.sh similarity index 100% rename from .travis.build.sh rename to .travis.deploy.sh diff --git a/.travis.yml b/.travis.yml index ad9f857..579cba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ install: - npm install script: - - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./.travis.build.sh; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./.travis.deploy.sh; fi' deploy: provider: pages From c21be1b308f5dd4d3f2c1c49c0582c7e9bf99f0d Mon Sep 17 00:00:00 2001 From: William Correa Date: Mon, 25 Mar 2019 00:57:42 -0300 Subject: [PATCH 18/18] [#17/feature] Add badge to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8c07307..35fc8d7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## Skeleton Quasar +[![Build Status](https://travis-ci.org/xprototype/skeleton-quasar.svg?branch=master)](https://travis-ci.org/xprototype/skeleton-quasar) + ### Start environment ``` $ cp .env.js.develop .env.js