Skip to content

Commit

Permalink
Merge pull request #24 from lefessan/z-2022-01-02-ton-update
Browse files Browse the repository at this point in the history
update for ton
  • Loading branch information
lefessan authored Jan 2, 2022
2 parents 59cb39c + 9f10a9f commit 6eb28ee
Show file tree
Hide file tree
Showing 25 changed files with 121 additions and 139 deletions.
85 changes: 44 additions & 41 deletions .drom
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# Keep this file in your GIT repo to help drom track generated files
# begin version
version:0.6.0~dev
# end version

# hash of toml configuration files
# used for generation of all files
eaf0d0bd408cc31f56f28cae7aabc539:.
ae28e31c9fe8ce8d81437bb2e96826c2:.
# end context for .

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

# begin context for .github/workflows/workflow.yml
# file .github/workflows/workflow.yml
6d0739e985277a2c6ee4e7f98ea45b24:.github/workflows/workflow.yml
0d7a51d88b68093c3ae0014a5cd3c540:.github/workflows/workflow.yml
# end context for .github/workflows/workflow.yml

# begin context for .gitignore
# file .gitignore
9f7fe49f7dbb5d9c06cc10fdaa541407:.gitignore
9d9e43f189dd8bb68d7849dfc252354e:.gitignore
# end context for .gitignore

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

# begin context for CHANGES.md
# file CHANGES.md
d15a796a0dc7cb31a6a917998e7f5f8e:CHANGES.md
31f426ad92ce570099748051439b4c6e:CHANGES.md
# end context for CHANGES.md

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

# begin context for README.md
# file README.md
f662c89c15314ed1da4c79e3ae338df8:README.md
2b3d496df8773ba4ae8d3b1e0d9f9b96:README.md
# end context for README.md

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

# begin context for dune-project
# file dune-project
99b59bc5699daeee756ea487634c9e65:dune-project
a893bcbb140b49101d846bd4c9f1da4d:dune-project
# end context for dune-project

# begin context for ez_hash.opam
# file ez_hash.opam
ebb17ef384f5f507750f9dbf99bd4634:ez_hash.opam
# end context for ez_hash.opam
# begin context for opam/ez_hash.opam
# file opam/ez_hash.opam
74f3b1b2de228b9028c37d096bd9fd9b:opam/ez_hash.opam
# end context for opam/ez_hash.opam

# begin context for opam/solidity-alcotest.opam
# file opam/solidity-alcotest.opam
a4c9943f6f64e7ebeb56bba07d75e9c9:opam/solidity-alcotest.opam
# end context for opam/solidity-alcotest.opam

# begin context for opam/solidity-common.opam
# file opam/solidity-common.opam
e8e5dcb722a9c89e8064da1d6fec7517:opam/solidity-common.opam
# end context for opam/solidity-common.opam

# begin context for opam/solidity-parser.opam
# file opam/solidity-parser.opam
f9eadb3fd651933ab4c7b31ff7abbe6d:opam/solidity-parser.opam
# end context for opam/solidity-parser.opam

# begin context for opam/solidity-test.opam
# file opam/solidity-test.opam
6aae049e168c8380e47eb15b96fea0c1:opam/solidity-test.opam
# end context for opam/solidity-test.opam

# begin context for opam/solidity-typechecker.opam
# file opam/solidity-typechecker.opam
5bab3820e2de1026fd9ceb6d8ff00326:opam/solidity-typechecker.opam
# end context for opam/solidity-typechecker.opam

# begin context for scripts/after.sh
# file scripts/after.sh
Expand All @@ -120,31 +148,6 @@ ae050b3099ac0b43d7c7f4295f6b2319:scripts/before.sh
bb3a9d286f0dc64021db4194427263ee:scripts/copy-bin.sh
# end context for scripts/copy-bin.sh

# begin context for solidity-alcotest.opam
# file solidity-alcotest.opam
46c7ae6bddb0890e6e4aef40dcd859f6:solidity-alcotest.opam
# end context for solidity-alcotest.opam

# begin context for solidity-common.opam
# file solidity-common.opam
7ee642e4fb70f30e8d144390bc3fb0d8:solidity-common.opam
# end context for solidity-common.opam

# begin context for solidity-parser.opam
# file solidity-parser.opam
6940d87ea57a5ed719e6d8df015d6783:solidity-parser.opam
# end context for solidity-parser.opam

# begin context for solidity-test.opam
# file solidity-test.opam
fe2781ece8eb3681fcd92d1dcff3155c:solidity-test.opam
# end context for solidity-test.opam

# begin context for solidity-typechecker.opam
# file solidity-typechecker.opam
dbf3d1e4092a9ccd80a55946c961ec44:solidity-typechecker.opam
# end context for solidity-typechecker.opam

# begin context for sphinx/_static/css/fixes.css
# file sphinx/_static/css/fixes.css
20bbe7a5dbb3c3278a1511d960616fe5:sphinx/_static/css/fixes.css
Expand Down Expand Up @@ -172,7 +175,7 @@ f481df414cb3f029bd800c66946eb287:sphinx/install.rst

# begin context for sphinx/license.rst
# file sphinx/license.rst
be5b2f331733cbbbfed0aba411d34691:sphinx/license.rst
29a935c9204f247218a88fb8aacd0306:sphinx/license.rst
# end context for sphinx/license.rst

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

# begin context for src/solidity-alcotest/version.mlt
# file src/solidity-alcotest/version.mlt
275d671a55d9bee3b649991bd4823c43:src/solidity-alcotest/version.mlt
c799168ebc3933d81375e3a5121e1062:src/solidity-alcotest/version.mlt
# end context for src/solidity-alcotest/version.mlt

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

# begin context for src/solidity-common/version.mlt
# file src/solidity-common/version.mlt
275d671a55d9bee3b649991bd4823c43:src/solidity-common/version.mlt
c799168ebc3933d81375e3a5121e1062:src/solidity-common/version.mlt
# end context for src/solidity-common/version.mlt

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

# begin context for src/solidity-parser/version.mlt
# file src/solidity-parser/version.mlt
275d671a55d9bee3b649991bd4823c43:src/solidity-parser/version.mlt
c799168ebc3933d81375e3a5121e1062:src/solidity-parser/version.mlt
# end context for src/solidity-parser/version.mlt

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

# begin context for src/solidity-test/version.mlt
# file src/solidity-test/version.mlt
275d671a55d9bee3b649991bd4823c43:src/solidity-test/version.mlt
c799168ebc3933d81375e3a5121e1062:src/solidity-test/version.mlt
# end context for src/solidity-test/version.mlt

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

# begin context for src/solidity-typechecker/version.mlt
# file src/solidity-typechecker/version.mlt
275d671a55d9bee3b649991bd4823c43:src/solidity-typechecker/version.mlt
c799168ebc3933d81375e3a5121e1062:src/solidity-typechecker/version.mlt
# end context for src/solidity-typechecker/version.mlt
25 changes: 23 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,16 @@ jobs:
id: cache-opam
with:
path: ~/.opam
key: v2-${{ runner.os }}-ocaml-solidity-${{ matrix.ocaml-compiler }}-${{ hashFiles('*.opam') }}
key: v2-${{ runner.os }}-ocaml-solidity-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }}
# restore-keys: |
# v2-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}-

- name: Use OCaml ${{ matrix.ocaml-compiler }}
uses: avsm/setup-ocaml@v2
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}
opam-pin: false
opam-depext: false

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

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

# - run: opam upgrade --fixup
Expand All @@ -81,3 +83,22 @@ jobs:
run: make fmt
continue-on-error: true
if: matrix.ocaml-compiler == '4.10.0' && matrix.os == 'ubuntu-latest'

- name: build-doc
if: github.ref == 'refs/heads/master' && matrix.ocaml-compiler == '4.10.0' && matrix.os == 'ubuntu-latest'
run: |
sudo apt install -yqq python3-sphinx python3-sphinx-rtd-theme
opam install -y dune odoc
make doc
touch _drom/docs/.nojekyll
touch _drom/docs/sphinx/.nojekyll
touch _drom/docs/doc/.nojekyll
- name: deploy-doc
uses: JamesIves/[email protected]
if: github.ref == 'refs/heads/master' && matrix.ocaml-compiler == '4.10.0' && matrix.os == 'ubuntu-latest'
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: _drom/docs/
CLEAN: true
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ _build
/_drom
/_opam
/_build

.drom.config


2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

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

* Initial commit
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

[![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)
[![Actions Status](https://github.com/OCamlPro/ocaml-solidity/workflows/Main%20Workflow/badge.svg)](https://github.com/OCamlPro/ocaml-solidity/actions)
[![Release](https://img.shields.io/github/release/OCamlPro/ocaml-solidity.svg)](https://github.com/OCamlPro/ocaml-solidity/releases)

# ocaml-solidity
Expand Down
2 changes: 1 addition & 1 deletion drom.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ license = "LGPL2"
min-edition = "4.08.0"
name = "ocaml-solidity"
synopsis = "The ocaml-solidity project"
version = "0.3.6"
version = "0.4.0"

# keys that you could also define:
# odoc-target = "...odoc-target..."
Expand Down
5 changes: 3 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
(lang dune 2.0)
(lang dune 2.7)
; This file was generated by drom, using drom.toml
(cram enable)
(name ocaml-solidity)
(allow_approximate_merlin)
(generate_opam_files false)
(version 0.3.6)
(version 0.4.0)
(formatting (enabled_for ocaml reason))
(using menhir 2.0)

Expand Down
5 changes: 2 additions & 3 deletions ez_hash.opam → opam/ez_hash.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
# Do not modify, or add to the `skip` field of `drom.toml`.
opam-version: "2.0"
name: "ez_hash"
version: "0.3.6"
version: "0.4.0"
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
synopsis: "Hash functions: sha3, sha256, blake2b"
description: """

Hash functions: sha3, sha256, blake2b
"""
authors: ["Fabrice Le Fessant <[email protected]>"]
Expand Down Expand Up @@ -40,7 +39,7 @@ install: [
]
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.6.0"}
"dune" {>= "2.7.0"}
"blake2" {}
"ppx_inline_test" {with-test}
"ppx_expect" {with-test}
Expand Down
5 changes: 2 additions & 3 deletions solidity-alcotest.opam → opam/solidity-alcotest.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
# Do not modify, or add to the `skip` field of `drom.toml`.
opam-version: "2.0"
name: "solidity-alcotest"
version: "0.3.6"
version: "0.4.0"
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
synopsis: "The ocaml-solidity project"
description: """

Ocaml-solidity provides a Solidity parser and typechecker
"""
authors: [
Expand Down Expand Up @@ -43,7 +42,7 @@ install: [
]
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.6.0"}
"dune" {>= "2.7.0"}
"solidity-typechecker" {= version}
"solidity-parser" {= version}
"solidity-common" {= version}
Expand Down
5 changes: 2 additions & 3 deletions solidity-common.opam → opam/solidity-common.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
# Do not modify, or add to the `skip` field of `drom.toml`.
opam-version: "2.0"
name: "solidity-common"
version: "0.3.6"
version: "0.4.0"
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
synopsis: "The ocaml-solidity project"
description: """

Ocaml-solidity provides a Solidity parser and typechecker
"""
authors: [
Expand Down Expand Up @@ -43,7 +42,7 @@ install: [
]
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.6.0"}
"dune" {>= "2.7.0"}
"zarith" {}
"hex" {>= "1"}
"fileutils" {>= "0.6"}
Expand Down
5 changes: 2 additions & 3 deletions solidity-parser.opam → opam/solidity-parser.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
# Do not modify, or add to the `skip` field of `drom.toml`.
opam-version: "2.0"
name: "solidity-parser"
version: "0.3.6"
version: "0.4.0"
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
synopsis: "The ocaml-solidity project"
description: """

Ocaml-solidity provides a Solidity parser and typechecker
"""
authors: [
Expand Down Expand Up @@ -43,7 +42,7 @@ install: [
]
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.6.0"}
"dune" {>= "2.7.0"}
"solidity-common" {= version}
"hex" {>= "1"}
"menhir" {}
Expand Down
5 changes: 2 additions & 3 deletions solidity-test.opam → opam/solidity-test.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
# Do not modify, or add to the `skip` field of `drom.toml`.
opam-version: "2.0"
name: "solidity-test"
version: "0.3.6"
version: "0.4.0"
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
synopsis: "The ocaml-solidity project"
description: """

Ocaml-solidity provides a Solidity parser and typechecker
"""
authors: [
Expand Down Expand Up @@ -43,7 +42,7 @@ install: [
]
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.6.0"}
"dune" {>= "2.7.0"}
"solidity-typechecker" {= version}
"solidity-parser" {= version}
"solidity-common" {= version}
Expand Down
5 changes: 2 additions & 3 deletions solidity-typechecker.opam → opam/solidity-typechecker.opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
# Do not modify, or add to the `skip` field of `drom.toml`.
opam-version: "2.0"
name: "solidity-typechecker"
version: "0.3.6"
version: "0.4.0"
license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
synopsis: "The ocaml-solidity project"
description: """

Ocaml-solidity provides a Solidity parser and typechecker
"""
authors: [
Expand Down Expand Up @@ -43,7 +42,7 @@ install: [
]
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.6.0"}
"dune" {>= "2.7.0"}
"uutf" {>= "1"}
"solidity-parser" {= version}
"solidity-common" {= version}
Expand Down
Loading

0 comments on commit 6eb28ee

Please sign in to comment.