From 3ad032e845eed8a5fd735e1903031612abcb19e1 Mon Sep 17 00:00:00 2001 From: Aleksey Proshutisnkiy Date: Thu, 16 Sep 2021 17:44:08 +0300 Subject: [PATCH] CI: pack builtin-service with generated .wasm (#28) --- .github/workflows/release.yml | 3 +- .gitignore | 6 +- aqua/ipfs.aqua | 2 + .../blueprint.json | 0 .../ipfs_effector_config.json | 0 .../ipfs_pure_config.json | 0 .../on_start.air | 0 .../on_start.json | 0 builtin-package/package.sh | 22 +++ service/Cargo.lock | 144 +++++++++--------- 10 files changed, 105 insertions(+), 72 deletions(-) rename {service/artifacts => builtin-package}/blueprint.json (100%) rename {service/artifacts => builtin-package}/ipfs_effector_config.json (100%) rename {service/artifacts => builtin-package}/ipfs_pure_config.json (100%) rename {service/artifacts => builtin-package}/on_start.air (100%) rename {service/artifacts => builtin-package}/on_start.json (100%) create mode 100755 builtin-package/package.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 701912b..9ddce27 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,8 +73,7 @@ jobs: - name: Create distribution package working-directory: ./service run: | - mv artifacts aqua-ipfs - tar -zcvf aqua-ipfs.tar.gz aqua-ipfs + ./buitin-package/package.sh - name: Check Aqua compiles working-directory: ./aqua diff --git a/.gitignore b/.gitignore index 8aeddd8..ab755df 100644 --- a/.gitignore +++ b/.gitignore @@ -11,10 +11,12 @@ example/generated/** # Added by cargo .idea -**/artifacts/*.wasm -*.wasm +service/artifacts/* +builtin-package/*.wasm **/node_modules **/dist .DS_store .bic_cache + +aqua-ipfs.tar.gz diff --git a/aqua/ipfs.aqua b/aqua/ipfs.aqua index bd0b87d..4be9db8 100644 --- a/aqua/ipfs.aqua +++ b/aqua/ipfs.aqua @@ -1,3 +1,5 @@ +module Ipfs declares * + data IpfsGetResult: success: bool error: string diff --git a/service/artifacts/blueprint.json b/builtin-package/blueprint.json similarity index 100% rename from service/artifacts/blueprint.json rename to builtin-package/blueprint.json diff --git a/service/artifacts/ipfs_effector_config.json b/builtin-package/ipfs_effector_config.json similarity index 100% rename from service/artifacts/ipfs_effector_config.json rename to builtin-package/ipfs_effector_config.json diff --git a/service/artifacts/ipfs_pure_config.json b/builtin-package/ipfs_pure_config.json similarity index 100% rename from service/artifacts/ipfs_pure_config.json rename to builtin-package/ipfs_pure_config.json diff --git a/service/artifacts/on_start.air b/builtin-package/on_start.air similarity index 100% rename from service/artifacts/on_start.air rename to builtin-package/on_start.air diff --git a/service/artifacts/on_start.json b/builtin-package/on_start.json similarity index 100% rename from service/artifacts/on_start.json rename to builtin-package/on_start.json diff --git a/builtin-package/package.sh b/builtin-package/package.sh new file mode 100755 index 0000000..bb85e77 --- /dev/null +++ b/builtin-package/package.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +set -o pipefail -o nounset -o errexit + +# set current working directory to script directory to run script from everywhere +cd "$(dirname "$0")" +SCRIPT_DIR="$(pwd)" + +( + echo "*** copy wasm files ***" + cd ../service + cp artifacts/*.wasm "$SCRIPT_DIR" +) + +( + echo "*** create builtin distribution package ***" + cd .. + mv builtin-package aqua-ipfs + tar --exclude="package.sh" -f aqua-ipfs.tar.gz -zcv ./aqua-ipfs + mv aqua-ipfs builtin-package +) + +echo "*** done ***" diff --git a/service/Cargo.lock b/service/Cargo.lock index 9b56353..42c4904 100644 --- a/service/Cargo.lock +++ b/service/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "arrayref" @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake3" @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" [[package]] name = "cfg-if" @@ -253,9 +253,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" dependencies = [ "quote", "syn", @@ -428,13 +428,14 @@ dependencies = [ [[package]] name = "fluence-it-types" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5006d09553345421af5dd2334cc945fc34dc2a73d7c1ed842a39a3803699619d" +checksum = "047f670b4807cab8872550a607b1515daff08b3e3bb7576ce8f45971fd811a4e" dependencies = [ "it-to-bytes", "nom", "serde", + "variant_count", "wast", ] @@ -690,9 +691,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "lazy_static" @@ -721,9 +722,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.98" +version = "0.2.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" [[package]] name = "lock_api" @@ -751,13 +752,13 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "marine-it-generator" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e62f29b16bbdb0763a04f8561c954624ee9cd9f558af4e67b95eb00880da11ec" +checksum = "e7b40920a86fb49456f0e94862d56a8e0bfc22489e518d894628da0f3ade03d8" dependencies = [ "cargo_toml", "it-lilo", - "marine-it-parser 0.6.5", + "marine-it-parser 0.6.6", "marine-macro-impl", "once_cell", "serde", @@ -779,9 +780,9 @@ dependencies = [ [[package]] name = "marine-it-interfaces" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18c137e51fd52ab7a3652233fc4eaa68e25a6a53d609bf9dd0f2e3bf67adee1" +checksum = "42e229143e72ba20e754de4766ff0d02e0cf176001f7471593f82b16c72dc26d" dependencies = [ "multimap", "wasmer-interface-types-fl", @@ -806,13 +807,13 @@ dependencies = [ [[package]] name = "marine-it-parser" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a6606e472587b2e7b759b16d037a4ea951facc2a6650f668f22403978c2442" +checksum = "4154fc98fcfeba65a45d774cff6eeb8bddc8aa66e897f46a74dc95e8823771ea" dependencies = [ "anyhow", "itertools 0.10.1", - "marine-it-interfaces 0.4.0", + "marine-it-interfaces 0.4.1", "marine-module-interface", "nom", "semver 0.11.0", @@ -825,18 +826,18 @@ dependencies = [ [[package]] name = "marine-macro" -version = "0.6.10" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd64d5febc6b2ed709a4461c510c1429dc6e4cfcbd6ca0d88463911630acd67b" +checksum = "3353b7531d6110d08cf553b3340414548928dd4ed9681fb33e5055434b1d230e" dependencies = [ "marine-macro-impl", ] [[package]] name = "marine-macro-impl" -version = "0.6.10" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c644127c4a9a3345434116f6887f8522c51bddde599b51d7d312aa8b2ecfaa54" +checksum = "93a923c20f7dc029eb6df361c1096a5a8bfbf133c1c2f0f96f1d0fdd6e075cc4" dependencies = [ "proc-macro2", "quote", @@ -864,13 +865,13 @@ dependencies = [ [[package]] name = "marine-module-interface" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a5936273bebb523ed169863282dbc19fc66bb983c7031c5b8b0556584f2401" +checksum = "035fb5d160a50cbcbe244a343081550f689ceba945d95281bbe207d98bf25586" dependencies = [ "anyhow", "itertools 0.10.1", - "marine-it-interfaces 0.4.0", + "marine-it-interfaces 0.4.1", "nom", "semver 0.11.0", "serde", @@ -882,9 +883,9 @@ dependencies = [ [[package]] name = "marine-rs-sdk" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157bae63a4bbdd7a29984f6ded08f8ed72991b83ca3bdd59d2f889fa8b8ea02" +checksum = "1bd39c5f9cdcf5b63c00eaf5fe50b366c88fc6d8fb6aac0dcfeaccf2ca024c5f" dependencies = [ "marine-macro", "marine-rs-sdk-main", @@ -894,9 +895,9 @@ dependencies = [ [[package]] name = "marine-rs-sdk-main" -version = "0.6.10" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c49b5893d8689589219e07cf67421cc415dc5f219ad0e9c197a9a050b5dd4f" +checksum = "f4de7d3a515ca69e9113c424491f65992305cc6decdd56e7764c699fb8b4071a" dependencies = [ "log", "marine-macro", @@ -927,8 +928,8 @@ dependencies = [ "it-lilo", "log", "marine-it-generator", - "marine-it-interfaces 0.4.0", - "marine-it-parser 0.6.5", + "marine-it-interfaces 0.4.1", + "marine-it-parser 0.6.6", "marine-module-info-parser", "marine-module-interface", "marine-utils", @@ -977,9 +978,9 @@ dependencies = [ [[package]] name = "marine-timestamp-macro" -version = "0.6.10" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ae1a5630bd9b652a77405750c3c37a5fdcfcdc679818bf7d970871ae28f7e6" +checksum = "18228f3153cb4a249752976f2e9eb7a888860c9efabe83475fcaca9f6f6e711a" dependencies = [ "chrono", "quote", @@ -993,15 +994,15 @@ checksum = "8dc5838acba84ce4d802d672afd0814fae0ae7098021ae5b06d975e70d09f812" [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memmap" @@ -1178,9 +1179,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" dependencies = [ "thiserror", "toml", @@ -1212,9 +1213,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" dependencies = [ "unicode-xid", ] @@ -1382,9 +1383,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "itoa", "ryu", @@ -1417,9 +1418,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.74" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" dependencies = [ "proc-macro2", "quote", @@ -1446,18 +1447,18 @@ checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d" [[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" dependencies = [ "proc-macro2", "quote", @@ -1477,9 +1478,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "5241dd6f21443a3606b432718b166d3cedc962fd4b8bea54a8bc7f514ebda986" dependencies = [ "tinyvec_macros", ] @@ -1501,9 +1502,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "types" @@ -1545,12 +1546,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" [[package]] name = "unicode-normalization" @@ -1606,6 +1604,16 @@ dependencies = [ "getrandom 0.2.3", ] +[[package]] +name = "variant_count" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "version_check" version = "0.9.3" @@ -1710,9 +1718,9 @@ dependencies = [ [[package]] name = "wasmer-interface-types-fl" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df960871d756f87237e7630daa0e8453dd48f9e44e0f214e795362a6daa04967" +checksum = "14ba3b5a07989987994b96bf5cc7ac2947005f9ff6123d71b7064232f07d28fa" dependencies = [ "fluence-it-types", "it-lilo", @@ -1759,9 +1767,9 @@ dependencies = [ [[package]] name = "wasmer-runtime-core-fl" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4630ff544a2d7f76938bcf82ae217e0bd5c9ee078c653459d4f117c2045d315" +checksum = "d0d5ac3e0603e5f0ffaf11cbd854eea7c3b609ab4b676f71968f2bc47f9e3c4a" dependencies = [ "bincode", "blake3", @@ -1788,9 +1796,9 @@ dependencies = [ [[package]] name = "wasmer-runtime-fl" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e855c8942f998a6938e43c1d0bb11b76a60b1c8341e08db36cc36b97b58bb1e9" +checksum = "5688460204d9f644d846300d041632cf34c4b4f83a955c0a67e600030376d2ee" dependencies = [ "lazy_static", "memmap",