balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,444 Commits 2 Branches 0 Tags 65 MiB
66c1e51cb2
Commit Graph

5444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John David Pressman
892f813a6c Merge branch 'contract/hashlock' into 'dev' 
[LIGO-406] Hashlock contract

See merge request ligolang/ligo!359
 2020-02-19 00:15:39 +00:00
John David Pressman
a7b86ce1af Merge branch 'docs/reference-doc-sidebar' into 'dev' 
Add reference pages to docs sidebar, change titles to include description like python

See merge request ligolang/ligo!422
 2020-02-19 00:12:30 +00:00
John David Pressman
b0eeb596df Merge branch 'dev' into docs/reference-doc-sidebar 2020-02-18 14:34:42 -08:00
Suzanne Dupéron
3f21cf7b26 Merge branch 'bugfix/gitlab-typo' into 'dev' 
Fix typo in script (third)

See merge request ligolang/ligo!435
 2020-02-18 15:20:06 +00:00
Suzanne Dupéron
2c677c2b73 Fix typo in script (third) 2020-02-18 16:18:59 +01:00
Pierre-Emmanuel Wulfman
9de45285b2 remove Var.show 2020-02-18 14:19:11 +01:00
Pierre-Emmanuel Wulfman
c468cb94a1 remove unused code 2020-02-18 14:16:05 +01:00
Tom Jack
e262f9e103 Demonstrate a couple simple_for_collect bugs 2020-02-18 14:09:29 +01:00
Rémi Lesenechal
abfd561ffb Merge branch 'feature/carthage-comparable-pairs' into 'dev' 
[LIGO-460] Feature/carthage comparable pairs

See merge request ligolang/ligo!419
 2020-02-18 12:56:06 +00:00
Lesenechal Remi
38c99eca53 carthage: add tests for comparable pairs 2020-02-18 12:31:19 +01:00
Suzanne Dupéron
b23ae21579 Merge branch 'bugfix/gitlab-typo' into 'dev' 
Fix typo in script (again)

See merge request ligolang/ligo!432
 2020-02-18 11:28:38 +00:00
Suzanne Dupéron
b594f85594 Fix typo in script (again) 2020-02-18 12:27:14 +01:00
Suzanne Dupéron
dafc574dc2 Merge branch 'bugfix/gitlab-typo' into 'dev' 
Fix typo in gitlab script

See merge request ligolang/ligo!431
 2020-02-18 11:25:41 +00:00
Lesenechal Remi
fd28da98a0 comparable pairs in the backend 2020-02-18 12:19:19 +01:00
Suzanne Dupéron
9f7b39afd3 Fix typo in script 2020-02-18 11:37:02 +01:00
Suzanne Dupéron
d2dee99bef Merge branch 'feature/run-dev' into 'dev' 
Run dev pipeline for *-run-dev branches

See merge request ligolang/ligo!428
 2020-02-18 10:33:04 +00:00
John David Pressman
b2c654ec65 Merge branch 'dev' into contract/hashlock 2020-02-17 20:51:31 -08:00
Rémi Lesenechal
3a1cd0bc94 Merge branch 'feature/move-to-carthage' into 'dev' 
[LIGO-460] carthage update

See merge request ligolang/ligo!414
 2020-02-17 17:14:28 +00:00
Suzanne Dupéron
f9d2daf7f3 Run dev pipeline for *-run-dev branches 2020-02-17 17:45:11 +01:00
Jev Björsell
2c3409f5cf Merge branch 'copy-download-output' into 'dev' 
Added copy and download to output. Improved tooltip component

See merge request ligolang/ligo!426
 2020-02-17 14:52:28 +00:00
Lesenechal Remi
e63f2407c2 carthage update: 
* update dune & opam files
* update modules in source
 2020-02-17 13:10:51 +01:00
Lesenechal Remi
395b4890eb update the dune.inc magic trick 2020-02-17 13:10:51 +01:00
Lesenechal Remi
5bb8c28959 carthage: update tezos copy/pasted files 2020-02-17 13:10:51 +01:00
Christian Rinderknecht
c04cd69103 Merge branch 'feature/literal-bytes-again-again' into 'dev' 
Fix literal bytes printing again

See merge request ligolang/ligo!423
 2020-02-16 11:47:57 +00:00
Maksym Bykovskyy
ddd148a290 Added copy and download to output. Improved tooltip component 2020-02-15 17:50:40 -08:00
Tom Jack
9f09506f58 Fix literal bytes printing again 2020-02-15 11:50:20 -06:00
Jev Björsell
26332f396e Merge branch 'ci/pin_dind_image' into 'dev' 
Pin docker image to a working one.

See merge request ligolang/ligo!424
 2020-02-15 15:54:36 +00:00
Jev Björsell
1d06dd4f74
Pin docker image to a working one. 
Related to ci job timeout tracked here: https://gitlab.com/gitlab-org/gitlab-runner/issues/6697
 2020-02-15 06:49:39 -08:00
John David Pressman
ee4d62be46 Add reference pages to docs sidebar, change titles to include description like python 2020-02-15 00:14:46 -08:00
Jev Björsell
b4ef2ed76f Merge branch 'compile-json-output' into 'dev' 
Added JSON output to compile command

See merge request ligolang/ligo!417
 2020-02-15 02:19:31 +00:00
John David Pressman
eaa0c12d63 e_ez_record -> e_record_ez in hashlock contract tests 2020-02-13 22:00:25 -08:00
John David Pressman
741374fa24 Merge branch 'dev' into contract/hashlock 2020-02-13 21:59:54 -08:00
John David Pressman
5764f53ed1 Refactor commitment mechanism, add reveal tests to hashlock contract 2020-02-13 21:54:16 -08:00
Maksym Bykovskyy
2a063a4353 Added JSON output to compile command 2020-02-13 17:19:16 -08:00
Jev Björsell
fddda1a0a2 Merge branch 'ci/webide_improvements' into 'dev' 
Refactor webide CI config and some general CI config

See merge request ligolang/ligo!412
 2020-02-13 23:10:02 +00:00
Jev Björsell
c59be5f746 * Switch to in-line CI for webide over GitLab's child-pipeline feature. There was too many bugs/weirdness with the child-pipeline. Maybe we use it when it matures. 
* Flatten the build_and_deploy_docker and build_and_deploy_website into one step. They don't appear to be dependent, and if the upstream "test" jobs ran okay, then we can run these jobs in parallel.
* Run the webide unit tests in the `test` stage only if there are changes to the tools/webide directory.
* Switch to using the new `rules` ([docs](https://docs.gitlab.com/ee/ci/yaml/#rules))property instead of `only` / `except`. `rules` is now the preferred way of setting job policies. `only`/`except` are [candidates for deprecation](https://docs.gitlab.com/ee/ci/yaml/#onlyexcept-basic).
* Build/push docker images only when CI is running on the canonical `ligolang/ligo` repo. Makes hacking on CI in forked repos easier.
* Don't push a `latest` tag for the webide.
 2020-02-13 23:10:02 +00:00
Rémi Lesenechal
eb056364a9 Merge branch '150-not-a-comparable-type-key_hash' into 'dev' 
Resolve "not a comparable type: key_hash"

Closes #150

See merge request ligolang/ligo!416
 2020-02-13 16:48:24 +00:00
Suzanne Dupéron
5dd53a30ff Merge branch 'patch-1' into 'dev' 
Update siteConfig.js to collapse docs sidebar categories

See merge request ligolang/ligo!415
 2020-02-13 16:11:19 +00:00
Lesenechal Remi
39fc076c2b fix regression of comparison of key_hash and add a test for it 2020-02-13 16:44:21 +01:00
Eowyn Dean
8e9e871d08 Update siteConfig.js to collapse docs sidebar categories 2020-02-13 14:50:35 +00:00
John David Pressman
f766840311 Fix commit test for hashlock 2020-02-13 04:35:21 -08:00
Suzanne Dupéron
eaba8e9857 Merge branch 'bugfix/147-bool-comparison' into 'dev' 
Resolve "Bool comparison"

Closes #147

See merge request ligolang/ligo!413
 2020-02-13 11:29:03 +00:00
Suzanne Dupéron
a1880b013b Fix #147 by allowing comparison of bools 2020-02-12 20:22:59 +01:00
Suzanne Dupéron
2c03ebf2e3 Merge branch 'docs/list-reference' into 'dev' 
Add list reference page to docs and add unit tests for List.size

See merge request ligolang/ligo!398
 2020-02-12 16:12:21 +00:00
Suzanne Dupéron
da546eabb7 Merge branch 'docs/crypto-reference' into 'dev' 
Add crypto reference page to doc tests

See merge request ligolang/ligo!410
 2020-02-12 15:43:09 +00:00
Suzanne Dupéron
a82e8efd2a Merge branch 'feature/remove-current-gas' into 'dev' 
Remove Current.gas from LIGO

See merge request ligolang/ligo!411
 2020-02-12 15:18:29 +00:00
Suzanne Dupéron
6be23179c6 Merge branch 'dev' into 'docs/list-reference' 
# Conflicts:
#   src/test/contracts/list.ligo
#   src/test/md_file_tests.ml
 2020-02-12 15:13:27 +00:00
John David Pressman
953e91bc54 Remove Current.gas from LIGO 2020-02-12 02:24:58 -08:00
John David Pressman
902e958205 Merge branch 'docs/map-reference' into 'dev' 
Add map reference page to docs

See merge request ligolang/ligo!374
 2020-02-12 02:54:35 +00:00
John David Pressman
d12aa130f7 Add crypto reference page to doc tests 2020-02-11 18:47:54 -08:00