From 934fe697b8f8f80ea4a888e18cdad95882164025 Mon Sep 17 00:00:00 2001 From: Martin Sosic Date: Mon, 21 Sep 2020 16:11:34 +0200 Subject: [PATCH] CI now creates draft releases. Moved CI badges to top README. --- .travis.yml | 1 + README.md | 2 ++ appveyor.yml | 1 + waspc/README.md | 22 +++++++--------------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28e0f0288..06061e1b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,7 @@ deploy: secure: IkYVwfhHNnNncrsDk+bjv80f4tRIDwjmyYSKd3Ssiuxzz/NDGIDuWDUfIApt9skI6URaZInQhF7BPZ0llHUOHOnCsfw2c8ve/XcX9BOqsczCGI1XFrnuFiwst9aogNTupkVL4sAPz45MysENfgWEbqDWXlMgj0DgYG2qk7mpCMcY0MUkw6ZNuozjs8uM6ilVYdTKPut8cMQsJkfX+kzA3x5BfnuRNSyfs8W5DjjwZ+vVAKzdw0zL49GWBjfFfh+QRiekWqziEfFO6EyaD75VSGQKa5VUQQvmmy2CDKPayj94STBTZdmnPGK2QXwiSdJxaDS/vw2TwHyiHRZkvkRQ20kr9+tMpZjuE5mN2xiRBUt8jDjGJWCxzfL1JbBPdtShcrCofDvTwAFOT6ykd9dbfzAhEubAO6L/S0JIs0sRj/M18bXKh5VeDCabBOLfh5wGtOWy44sQ1FMW+vismA4MLYYMm5bSxjL+HWE7ijSbHOF0ew72L/cbHKXhALv48VNGVYj7wy/6MC7HXkgHyxGPUn5tx2a0oUBWkK62Asmba42i2KDed6ylChlivIijyoeg3dpYpcZjr4HfuC1e1O+NHIF8uke9yc7sNp3vdriD8HxvdmJQrbbwy3EIMSW9v5soePDTJywNEAcIwUCl6USE2fVShRuYcvhbkLYGoQMzh8U= file: "wasp-${TRAVIS_OS_NAME}-x86_64.tar.gz" skip_cleanup: true + draft: true on: # Whenever we push a tagged commit, binary will be deployed to releases. tags: true diff --git a/README.md b/README.md index 7f2a8a9be..e176180b3 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@
[![Discord](https://img.shields.io/discord/686873244791210014?label=chat%20on%20discord)](https://discord.gg/rzdnErX) +[![Build Status](https://travis-ci.com/wasp-lang/wasp.svg?branch=master)](https://travis-ci.com/wasp-lang/wasp) +[![Build Status](https://ci.appveyor.com/api/projects/status/github/wasp-lang/wasp?branch=master&svg=true)](https://ci.appveyor.com/project/Martinsos/wasp/branch/master) - **Project page**: [https://wasp-lang.dev] - **Demo**: [https://wasp-lang.dev/#demo] diff --git a/appveyor.yml b/appveyor.yml index d9dacf2ce..c61806e94 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,6 +59,7 @@ deploy: description: "Automatic release" artifact: wasp-win-x86_64 force_update: true # Adds files to release even if it already exists. + draft: true on: APPVEYOR_REPO_TAG: true # Deploy on tag push only. diff --git a/waspc/README.md b/waspc/README.md index da4298622..af0fdb2ff 100644 --- a/waspc/README.md +++ b/waspc/README.md @@ -13,33 +13,25 @@ |_| ``` -[![Build Status](https://travis-ci.com/wasp-lang/wasp.svg?branch=master)](https://travis-ci.com/wasp-lang/wasp) - -[![Build Status](https://ci.appveyor.com/api/projects/status/github/wasp-lang/wasp?branch=master&svg=true)](https://ci.appveyor.com/project/Martinsos/wasp/branch/master) - ## Install +### From binary To install latest release, run `curl -sSL https://raw.githubusercontent.com/wasp-lang/wasp/master/waspc/tools/install.sh | sh`! This will work for linux/osx and will install a prebuilt binary. Since the binary is dynamically built (for now), it might not work if you are missing some packages/libraries on your OS or if your OS distro is very different from the one it was built on. -## Setup +### From source Install `stack`. Run `stack setup` in the project root to do initial setup. +Run `stack build` to build the project, including wasp binary. + +Run `stack exec wasp ` to run wasp binary. + + ## Project configuration overview This is a [Stack](https://docs.haskellstack.org/en/stable/README/) project. -Stack installs GHC and packages automatically, in reproducible manner, in an isolated environment just for your Haskell project. - -This project was created from `new-template` stack template and then modified inspired by `haskeleton` stack template. - -Most important configuration file is `package.yaml`. Here we define what is what in our project, how is it built. Stack generates `waspc.cabal` from this document. - -Also important is `stack.yaml` where we define Stack configuration for this project. - -We provided some pieces of Stack documentation in this README to make it easier to start with the project, but for any more detailed and guaranteed up-to-date docs check Stack docs at https://docs.haskellstack.org/en/stable/README/. - ### Adding a package as a dependency This is just so you don't have to search Stack docs.