balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/website-fixes' into 'dev'

Browse Source 
Small fixes to the doc and to the odoc build script

See merge request ligolang/ligo!43
This commit is contained in:
Matej Šima 2019-06-21 12:46:54 +00:00
commit 34c84f5bed
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -52,9 +52,10 @@ stages:
- npm run version next
- npm run build
# move internal odoc documentation to the website folder
- mkdir -p gitlab-pages/website/build/ligo/
- mv ../../_build/default/_doc/_html/ gitlab-pages/website/build/ligo/odoc
- ls gitlab-pages/website/build/ligo/ # for debug
- mkdir -p build/ligo/
- mv ../../_build/default/_doc/_html/ build/ligo/odoc
- pwd # for debug
- ls build/ligo/ # for debug
after_script:
- cp -r gitlab-pages/website/build/ligo public
artifacts:
@ -158,4 +159,4 @@ pages:
only:
- master
- dev
- feature/#3-add-odoc-to-website
- feature/website-fixes

6
gitlab-pages/docs/tutorials/get-started/tezos-taco-shop-smart-contract.md
View File

@ -20,7 +20,7 @@ To help Pedro open his dream taco shop, we'll implement a smart-contract, that w
Pedro's tacos are a rare delicacy, so their **price goes up**, as the **stock for the day begins to deplete**.
Each taco kind, has it's own `max_price` that it sells for, and a finite supply for the current sales lifecycle.
Each taco kind, has its own `max_price` that it sells for, and a finite supply for the current sales lifecycle.
> For the sake of simplicity, we won't implement replenishing of the supply after it runs out.
@ -136,7 +136,7 @@ end
type taco_shop_storage is map(nat, taco_supply);
```
Next step is to update the `main` entry point to include `taco_shop_storage` as it's storage - while doing that let's set the `parameter` to `unit` as well to clear things up.
Next step is to update the `main` entry point to include `taco_shop_storage` as its storage - while doing that let's set the `parameter` to `unit` as well to clear things up.
**`taco-shop.ligo`**
```Pascal
@ -189,7 +189,7 @@ end"
<br/>
*If everything went as expected, the `dry-run` command will return the contract's current storage, which is the map of products we've defined based on the daily offer of Pedro's taco shop.*
*If everything went as expected, the `dry-run` command will return an empty list of operations and the contract's current storage, which is the map of products we've defined based on the daily offer of Pedro's taco shop.*
---