Skip to content

Commit 6eb28ee

Browse files
authored
Merge pull request #24 from lefessan/z-2022-01-02-ton-update
update for ton
2 parents 59cb39c + 9f10a9f commit 6eb28ee

25 files changed

+121
-139
lines changed

.drom

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Keep this file in your GIT repo to help drom track generated files
2+
# begin version
3+
version:0.6.0~dev
4+
# end version
25

36
# hash of toml configuration files
47
# used for generation of all files
5-
eaf0d0bd408cc31f56f28cae7aabc539:.
8+
ae28e31c9fe8ce8d81437bb2e96826c2:.
69
# end context for .
710

811
# begin context for .github/workflows/doc-deploy.yml
@@ -12,12 +15,12 @@ e5c654f9557b31aa070c7ef28060ae9e:.github/workflows/doc-deploy.yml
1215

1316
# begin context for .github/workflows/workflow.yml
1417
# file .github/workflows/workflow.yml
15-
6d0739e985277a2c6ee4e7f98ea45b24:.github/workflows/workflow.yml
18+
0d7a51d88b68093c3ae0014a5cd3c540:.github/workflows/workflow.yml
1619
# end context for .github/workflows/workflow.yml
1720

1821
# begin context for .gitignore
1922
# file .gitignore
20-
9f7fe49f7dbb5d9c06cc10fdaa541407:.gitignore
23+
9d9e43f189dd8bb68d7849dfc252354e:.gitignore
2124
# end context for .gitignore
2225

2326
# begin context for .ocamlformat
@@ -37,7 +40,7 @@ a8d1bcd6f62c6b813b77d3ff8959d8d2:.ocamlformat-ignore
3740

3841
# begin context for CHANGES.md
3942
# file CHANGES.md
40-
d15a796a0dc7cb31a6a917998e7f5f8e:CHANGES.md
43+
31f426ad92ce570099748051439b4c6e:CHANGES.md
4144
# end context for CHANGES.md
4245

4346
# begin context for LICENSE.md
@@ -52,7 +55,7 @@ eebc5e7dc1ae2ca50e86ea1c09e012d7:Makefile
5255

5356
# begin context for README.md
5457
# file README.md
55-
f662c89c15314ed1da4c79e3ae338df8:README.md
58+
2b3d496df8773ba4ae8d3b1e0d9f9b96:README.md
5659
# end context for README.md
5760

5861
# begin context for docs/README.txt
@@ -97,13 +100,38 @@ c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css
97100

98101
# begin context for dune-project
99102
# file dune-project
100-
99b59bc5699daeee756ea487634c9e65:dune-project
103+
a893bcbb140b49101d846bd4c9f1da4d:dune-project
101104
# end context for dune-project
102105

103-
# begin context for ez_hash.opam
104-
# file ez_hash.opam
105-
ebb17ef384f5f507750f9dbf99bd4634:ez_hash.opam
106-
# end context for ez_hash.opam
106+
# begin context for opam/ez_hash.opam
107+
# file opam/ez_hash.opam
108+
74f3b1b2de228b9028c37d096bd9fd9b:opam/ez_hash.opam
109+
# end context for opam/ez_hash.opam
110+
111+
# begin context for opam/solidity-alcotest.opam
112+
# file opam/solidity-alcotest.opam
113+
a4c9943f6f64e7ebeb56bba07d75e9c9:opam/solidity-alcotest.opam
114+
# end context for opam/solidity-alcotest.opam
115+
116+
# begin context for opam/solidity-common.opam
117+
# file opam/solidity-common.opam
118+
e8e5dcb722a9c89e8064da1d6fec7517:opam/solidity-common.opam
119+
# end context for opam/solidity-common.opam
120+
121+
# begin context for opam/solidity-parser.opam
122+
# file opam/solidity-parser.opam
123+
f9eadb3fd651933ab4c7b31ff7abbe6d:opam/solidity-parser.opam
124+
# end context for opam/solidity-parser.opam
125+
126+
# begin context for opam/solidity-test.opam
127+
# file opam/solidity-test.opam
128+
6aae049e168c8380e47eb15b96fea0c1:opam/solidity-test.opam
129+
# end context for opam/solidity-test.opam
130+
131+
# begin context for opam/solidity-typechecker.opam
132+
# file opam/solidity-typechecker.opam
133+
5bab3820e2de1026fd9ceb6d8ff00326:opam/solidity-typechecker.opam
134+
# end context for opam/solidity-typechecker.opam
107135

108136
# begin context for scripts/after.sh
109137
# file scripts/after.sh
@@ -120,31 +148,6 @@ ae050b3099ac0b43d7c7f4295f6b2319:scripts/before.sh
120148
bb3a9d286f0dc64021db4194427263ee:scripts/copy-bin.sh
121149
# end context for scripts/copy-bin.sh
122150

123-
# begin context for solidity-alcotest.opam
124-
# file solidity-alcotest.opam
125-
46c7ae6bddb0890e6e4aef40dcd859f6:solidity-alcotest.opam
126-
# end context for solidity-alcotest.opam
127-
128-
# begin context for solidity-common.opam
129-
# file solidity-common.opam
130-
7ee642e4fb70f30e8d144390bc3fb0d8:solidity-common.opam
131-
# end context for solidity-common.opam
132-
133-
# begin context for solidity-parser.opam
134-
# file solidity-parser.opam
135-
6940d87ea57a5ed719e6d8df015d6783:solidity-parser.opam
136-
# end context for solidity-parser.opam
137-
138-
# begin context for solidity-test.opam
139-
# file solidity-test.opam
140-
fe2781ece8eb3681fcd92d1dcff3155c:solidity-test.opam
141-
# end context for solidity-test.opam
142-
143-
# begin context for solidity-typechecker.opam
144-
# file solidity-typechecker.opam
145-
dbf3d1e4092a9ccd80a55946c961ec44:solidity-typechecker.opam
146-
# end context for solidity-typechecker.opam
147-
148151
# begin context for sphinx/_static/css/fixes.css
149152
# file sphinx/_static/css/fixes.css
150153
20bbe7a5dbb3c3278a1511d960616fe5:sphinx/_static/css/fixes.css
@@ -172,7 +175,7 @@ f481df414cb3f029bd800c66946eb287:sphinx/install.rst
172175

173176
# begin context for sphinx/license.rst
174177
# file sphinx/license.rst
175-
be5b2f331733cbbbfed0aba411d34691:sphinx/license.rst
178+
29a935c9204f247218a88fb8aacd0306:sphinx/license.rst
176179
# end context for sphinx/license.rst
177180

178181
# begin context for src/ez_hash/dune
@@ -197,7 +200,7 @@ e86f9a67236dac57aaae3ca819cb7dbb:src/ocaml-solidity/package.toml
197200

198201
# begin context for src/solidity-alcotest/version.mlt
199202
# file src/solidity-alcotest/version.mlt
200-
275d671a55d9bee3b649991bd4823c43:src/solidity-alcotest/version.mlt
203+
c799168ebc3933d81375e3a5121e1062:src/solidity-alcotest/version.mlt
201204
# end context for src/solidity-alcotest/version.mlt
202205

203206
# begin context for src/solidity-common/dune
@@ -217,7 +220,7 @@ e86f9a67236dac57aaae3ca819cb7dbb:src/ocaml-solidity/package.toml
217220

218221
# begin context for src/solidity-common/version.mlt
219222
# file src/solidity-common/version.mlt
220-
275d671a55d9bee3b649991bd4823c43:src/solidity-common/version.mlt
223+
c799168ebc3933d81375e3a5121e1062:src/solidity-common/version.mlt
221224
# end context for src/solidity-common/version.mlt
222225

223226
# begin context for src/solidity-parser/dune
@@ -237,7 +240,7 @@ be413a351ddaf3cdf0d44e91ad35680e:src/solidity-parser/main.ml
237240

238241
# begin context for src/solidity-parser/version.mlt
239242
# file src/solidity-parser/version.mlt
240-
275d671a55d9bee3b649991bd4823c43:src/solidity-parser/version.mlt
243+
c799168ebc3933d81375e3a5121e1062:src/solidity-parser/version.mlt
241244
# end context for src/solidity-parser/version.mlt
242245

243246
# begin context for src/solidity-test/dune
@@ -247,7 +250,7 @@ be413a351ddaf3cdf0d44e91ad35680e:src/solidity-parser/main.ml
247250

248251
# begin context for src/solidity-test/version.mlt
249252
# file src/solidity-test/version.mlt
250-
275d671a55d9bee3b649991bd4823c43:src/solidity-test/version.mlt
253+
c799168ebc3933d81375e3a5121e1062:src/solidity-test/version.mlt
251254
# end context for src/solidity-test/version.mlt
252255

253256
# begin context for src/solidity-typechecker/dune
@@ -267,5 +270,5 @@ be413a351ddaf3cdf0d44e91ad35680e:src/solidity-parser/main.ml
267270

268271
# begin context for src/solidity-typechecker/version.mlt
269272
# file src/solidity-typechecker/version.mlt
270-
275d671a55d9bee3b649991bd4823c43:src/solidity-typechecker/version.mlt
273+
c799168ebc3933d81375e3a5121e1062:src/solidity-typechecker/version.mlt
271274
# end context for src/solidity-typechecker/version.mlt

.github/workflows/workflow.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,16 @@ jobs:
3838
id: cache-opam
3939
with:
4040
path: ~/.opam
41-
key: v2-${{ runner.os }}-ocaml-solidity-${{ matrix.ocaml-compiler }}-${{ hashFiles('*.opam') }}
41+
key: v2-${{ runner.os }}-ocaml-solidity-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }}
4242
# restore-keys: |
4343
# v2-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}-
4444

4545
- name: Use OCaml ${{ matrix.ocaml-compiler }}
4646
uses: avsm/setup-ocaml@v2
4747
with:
4848
ocaml-compiler: ${{ matrix.ocaml-compiler }}
49+
opam-pin: false
50+
opam-depext: false
4951

5052
- name: Set git user
5153
run: |
@@ -59,7 +61,7 @@ jobs:
5961
- run: opam depext -y ez_hash solidity-common solidity-parser solidity-typechecker solidity-test solidity-alcotest
6062
# if: steps.cache-opam.outputs.cache-hit != 'true'
6163

62-
- run: opam install -y ./*.opam --deps-only --with-test
64+
- run: opam install -y opam/*.opam --deps-only --with-test
6365
# if: steps.cache-opam.outputs.cache-hit != 'true'
6466

6567
# - run: opam upgrade --fixup
@@ -81,3 +83,22 @@ jobs:
8183
run: make fmt
8284
continue-on-error: true
8385
if: matrix.ocaml-compiler == '4.10.0' && matrix.os == 'ubuntu-latest'
86+
87+
- name: build-doc
88+
if: github.ref == 'refs/heads/master' && matrix.ocaml-compiler == '4.10.0' && matrix.os == 'ubuntu-latest'
89+
run: |
90+
sudo apt install -yqq python3-sphinx python3-sphinx-rtd-theme
91+
opam install -y dune odoc
92+
make doc
93+
touch _drom/docs/.nojekyll
94+
touch _drom/docs/sphinx/.nojekyll
95+
touch _drom/docs/doc/.nojekyll
96+
97+
- name: deploy-doc
98+
uses: JamesIves/[email protected]
99+
if: github.ref == 'refs/heads/master' && matrix.ocaml-compiler == '4.10.0' && matrix.os == 'ubuntu-latest'
100+
with:
101+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
102+
BRANCH: gh-pages
103+
FOLDER: _drom/docs/
104+
CLEAN: true

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ _build
77
/_drom
88
/_opam
99
/_build
10-
10+
.drom.config
1111

1212

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

2-
## v0.1.0 ( 2021-09-06 )
2+
## v0.1.0 ( 2022-01-02 )
33

44
* Initial commit

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
[![Actions Status](https://github.com/OCamlPro/ocaml-solidity/workflows/Main%20Workflow/badge.svg)](https://github.com/OCamlPro/ocaml-solidity/actions)[![Actions Status](https://github.com/OCamlPro/ocaml-solidity/workflows/doc-deploy/badge.svg)](https://github.com/OCamlPro/ocaml-solidity/actions)
2+
[![Actions Status](https://github.com/OCamlPro/ocaml-solidity/workflows/Main%20Workflow/badge.svg)](https://github.com/OCamlPro/ocaml-solidity/actions)
33
[![Release](https://img.shields.io/github/release/OCamlPro/ocaml-solidity.svg)](https://github.com/OCamlPro/ocaml-solidity/releases)
44

55
# ocaml-solidity

drom.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ license = "LGPL2"
1515
min-edition = "4.08.0"
1616
name = "ocaml-solidity"
1717
synopsis = "The ocaml-solidity project"
18-
version = "0.3.6"
18+
version = "0.4.0"
1919

2020
# keys that you could also define:
2121
# odoc-target = "...odoc-target..."

dune-project

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
(lang dune 2.0)
1+
(lang dune 2.7)
22
; This file was generated by drom, using drom.toml
3+
(cram enable)
34
(name ocaml-solidity)
45
(allow_approximate_merlin)
56
(generate_opam_files false)
6-
(version 0.3.6)
7+
(version 0.4.0)
78
(formatting (enabled_for ocaml reason))
89
(using menhir 2.0)
910

ez_hash.opam renamed to opam/ez_hash.opam

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
# Do not modify, or add to the `skip` field of `drom.toml`.
33
opam-version: "2.0"
44
name: "ez_hash"
5-
version: "0.3.6"
5+
version: "0.4.0"
66
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
77
synopsis: "Hash functions: sha3, sha256, blake2b"
88
description: """
9-
109
Hash functions: sha3, sha256, blake2b
1110
"""
1211
authors: ["Fabrice Le Fessant <[email protected]>"]
@@ -40,7 +39,7 @@ install: [
4039
]
4140
depends: [
4241
"ocaml" {>= "4.08.0"}
43-
"dune" {>= "2.6.0"}
42+
"dune" {>= "2.7.0"}
4443
"blake2" {}
4544
"ppx_inline_test" {with-test}
4645
"ppx_expect" {with-test}

solidity-alcotest.opam renamed to opam/solidity-alcotest.opam

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
# Do not modify, or add to the `skip` field of `drom.toml`.
33
opam-version: "2.0"
44
name: "solidity-alcotest"
5-
version: "0.3.6"
5+
version: "0.4.0"
66
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
77
synopsis: "The ocaml-solidity project"
88
description: """
9-
109
Ocaml-solidity provides a Solidity parser and typechecker
1110
"""
1211
authors: [
@@ -43,7 +42,7 @@ install: [
4342
]
4443
depends: [
4544
"ocaml" {>= "4.08.0"}
46-
"dune" {>= "2.6.0"}
45+
"dune" {>= "2.7.0"}
4746
"solidity-typechecker" {= version}
4847
"solidity-parser" {= version}
4948
"solidity-common" {= version}

solidity-common.opam renamed to opam/solidity-common.opam

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
# Do not modify, or add to the `skip` field of `drom.toml`.
33
opam-version: "2.0"
44
name: "solidity-common"
5-
version: "0.3.6"
5+
version: "0.4.0"
66
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
77
synopsis: "The ocaml-solidity project"
88
description: """
9-
109
Ocaml-solidity provides a Solidity parser and typechecker
1110
"""
1211
authors: [
@@ -43,7 +42,7 @@ install: [
4342
]
4443
depends: [
4544
"ocaml" {>= "4.08.0"}
46-
"dune" {>= "2.6.0"}
45+
"dune" {>= "2.7.0"}
4746
"zarith" {}
4847
"hex" {>= "1"}
4948
"fileutils" {>= "0.6"}

0 commit comments

Comments
 (0)