diff --git a/.github/workflows/aquamarine_pre_release.yml b/.github/workflows/aquamarine_pre_release.yml new file mode 100644 index 00000000..3899fc58 --- /dev/null +++ b/.github/workflows/aquamarine_pre_release.yml @@ -0,0 +1,52 @@ +name: "pre-release" + +on: + push: + branches: + - "master" + +jobs: + pre-release: + name: "Pre Release" + runs-on: "ubuntu-latest" + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + target: wasm32-wasi + profile: minimal + override: true + + - name: Install fcli + uses: actions-rs/cargo@v1 + with: + toolchain: nightly + command: install + args: fcli + + ### Update & build + - uses: actions-rs/cargo@v1 + with: + toolchain: nightly + command: update + + - name: fce build --release + working-directory: ./stepper + shell: bash + run: fce build --release --features fce + + ### Create pre-release + - uses: marvinpinto/action-automatic-releases@latest + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "latest" + prerelease: true + title: "Dev Build" + files: | + LICENSE + target/wasm32-wasi/release/aquamarine.wasm diff --git a/.github/workflows/aquamarine_tag_release.yml b/.github/workflows/aquamarine_tag_release.yml new file mode 100644 index 00000000..fcfb7dc0 --- /dev/null +++ b/.github/workflows/aquamarine_tag_release.yml @@ -0,0 +1,51 @@ +name: "tagged-release" + +on: + push: + tags: + - "v*" + +jobs: + pre-release: + name: "Tagged Release" + runs-on: "ubuntu-latest" + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + target: wasm32-wasi + profile: minimal + override: true + + - name: Install fcli + uses: actions-rs/cargo@v1 + with: + toolchain: nightly + command: install + args: fcli + + ### Update & build + - uses: actions-rs/cargo@v1 + with: + toolchain: nightly + command: update + + - name: fce build --release + working-directory: ./stepper + shell: bash + run: fce build --release --features fce + + ### Create release + - uses: marvinpinto/action-automatic-releases@latest + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "latest" + prerelease: false + files: | + LICENSE + target/wasm32-wasi/release/aquamarine.wasm diff --git a/Cargo.lock b/Cargo.lock index b3b4ad79..2d80a5d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "aquamarine-vm" version = "0.1.2" -source = "git+https://github.com/fluencelabs/fce#e24bb8e1ac503cdde9b1397a34ebced0132feaf1" +source = "git+https://github.com/fluencelabs/fce?branch=master#af75084ceb950560a56399a946c985c5df0bb480" dependencies = [ "fluence-faas", "maplit", @@ -639,7 +639,7 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fce" version = "0.1.11" -source = "git+https://github.com/fluencelabs/fce#e24bb8e1ac503cdde9b1397a34ebced0132feaf1" +source = "git+https://github.com/fluencelabs/fce?branch=master#af75084ceb950560a56399a946c985c5df0bb480" dependencies = [ "boolinator", "fce-utils", @@ -661,12 +661,12 @@ dependencies = [ [[package]] name = "fce-utils" version = "0.1.0" -source = "git+https://github.com/fluencelabs/fce#e24bb8e1ac503cdde9b1397a34ebced0132feaf1" +source = "git+https://github.com/fluencelabs/fce?branch=master#af75084ceb950560a56399a946c985c5df0bb480" [[package]] name = "fce-wit-interfaces" version = "0.1.8" -source = "git+https://github.com/fluencelabs/fce#e24bb8e1ac503cdde9b1397a34ebced0132feaf1" +source = "git+https://github.com/fluencelabs/fce?branch=master#af75084ceb950560a56399a946c985c5df0bb480" dependencies = [ "multimap", "wasmer-interface-types-fl", @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "fce-wit-parser" version = "0.1.10" -source = "git+https://github.com/fluencelabs/fce#e24bb8e1ac503cdde9b1397a34ebced0132feaf1" +source = "git+https://github.com/fluencelabs/fce?branch=master#af75084ceb950560a56399a946c985c5df0bb480" dependencies = [ "anyhow", "fce-wit-interfaces", @@ -702,7 +702,7 @@ dependencies = [ [[package]] name = "fluence-faas" version = "0.1.12" -source = "git+https://github.com/fluencelabs/fce#e24bb8e1ac503cdde9b1397a34ebced0132feaf1" +source = "git+https://github.com/fluencelabs/fce?branch=master#af75084ceb950560a56399a946c985c5df0bb480" dependencies = [ "cmd_lib", "fce", @@ -721,14 +721,6 @@ dependencies = [ "wasmer-wasi-fl", ] -[[package]] -name = "fluence-sdk-macro" -version = "0.2.9" -source = "git+https://github.com/fluencelabs/rust-sdk#fd9672636e8d7a91275e5e0b8b88a34494336e5a" -dependencies = [ - "fluence-sdk-wit 0.2.9 (git+https://github.com/fluencelabs/rust-sdk)", -] - [[package]] name = "fluence-sdk-macro" version = "0.2.9" @@ -739,13 +731,11 @@ dependencies = [ ] [[package]] -name = "fluence-sdk-main" +name = "fluence-sdk-macro" version = "0.2.9" source = "git+https://github.com/fluencelabs/rust-sdk#fd9672636e8d7a91275e5e0b8b88a34494336e5a" dependencies = [ - "fluence-sdk-macro 0.2.9 (git+https://github.com/fluencelabs/rust-sdk)", - "log", - "serde", + "fluence-sdk-wit 0.2.9 (git+https://github.com/fluencelabs/rust-sdk)", ] [[package]] @@ -760,9 +750,20 @@ dependencies = [ ] [[package]] -name = "fluence-sdk-wit" +name = "fluence-sdk-main" version = "0.2.9" source = "git+https://github.com/fluencelabs/rust-sdk#fd9672636e8d7a91275e5e0b8b88a34494336e5a" +dependencies = [ + "fluence-sdk-macro 0.2.9 (git+https://github.com/fluencelabs/rust-sdk)", + "log", + "serde", +] + +[[package]] +name = "fluence-sdk-wit" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c68c4d07e821e1be23b01c278acdae4e825d03c46879f453426ea3160b3e25" dependencies = [ "proc-macro2", "quote", @@ -775,8 +776,7 @@ dependencies = [ [[package]] name = "fluence-sdk-wit" version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c68c4d07e821e1be23b01c278acdae4e825d03c46879f453426ea3160b3e25" +source = "git+https://github.com/fluencelabs/rust-sdk#fd9672636e8d7a91275e5e0b8b88a34494336e5a" dependencies = [ "proc-macro2", "quote", @@ -1174,9 +1174,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +checksum = "f53cef67919d7d247eb9a2f128ca9e522789967ef1eb4ccd8c71a95a8aedf596" [[package]] name = "oorandom" @@ -1988,9 +1988,9 @@ dependencies = [ [[package]] name = "wasmer-interface-types-fl" -version = "0.17.17" +version = "0.17.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35785dfb889bbd6f83f5239fb1b950889368ceba23acf1603c371f337e8c4d1c" +checksum = "9c01499babf417b51c28db8e735579d0645d89ee77a57f23492d61a610bb42b8" dependencies = [ "log", "nom",