Skip to content

Commit

Permalink
chore: Renaming things (#335)
Browse files Browse the repository at this point in the history
* Migrate aqua-playground tests to aqua

* Update

* Fix

* Add decider

* Remove sqlite wasm tests :(

* Use master

* F?

* Debug

* Fix
  • Loading branch information
nahsi authored Jul 14, 2023
1 parent d4ccc72 commit 974f593
Showing 1 changed file with 60 additions and 36 deletions.
96 changes: 60 additions & 36 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ jobs:
needs: sqlite
uses: fluencelabs/sqlite-wasm-connector/.github/workflows/snapshot.yml@master

sqlite-wasm-tests:
name: "sqlite-wasm"
needs: sqlite
uses: fluencelabs/sqlite-wasm-connector/.github/workflows/tests.yml@master

spell:
needs: sqlite-wasm
uses: fluencelabs/spell/.github/workflows/snapshot.yml@main
Expand All @@ -55,6 +50,21 @@ jobs:
}
]
decider:
needs:
- spell
uses: fluencelabs/decider/.github/workflows/snapshot.yml@main
with:
cargo-dependencies: |
[
{
"package": "fluence-spell-dtos",
"version": "=${{ needs.spell.outputs.cargo-version }}",
"manifest": "src/distro/Cargo.toml",
"registry": "fluence"
}
]
aquavm-wasm:
name: "aquavm"
needs:
Expand Down Expand Up @@ -108,13 +118,14 @@ jobs:
- aquavm-wasm
uses: fluencelabs/aquavm/.github/workflows/snapshot-avm.yml@master

rust-peer:
nox:
needs:
- marine
- aquavm-crates
- spell
- decider

uses: fluencelabs/rust-peer/.github/workflows/build.yml@master
uses: fluencelabs/nox/.github/workflows/build.yml@debug-spell-dtos
with:
cargo-dependencies: |
[
Expand All @@ -133,6 +144,12 @@ jobs:
"version": "=${{ needs.aquavm-crates.outputs.version }}",
"registry": "fluence"
},
{
"package": "decider-distro",
"version": "=${{ needs.decider.outputs.cargo-version }}",
"manifest": "crates/system-services/Cargo.toml",
"registry": "fluence"
},
{
"package": "fluence-spell-dtos",
"version": "=${{ needs.spell.outputs.cargo-version }}",
Expand Down Expand Up @@ -168,25 +185,26 @@ jobs:
}
]
rust-peer-snapshot:
name: "rust-peer"
nox-snapshot:
name: "nox"
needs:
- rust-peer
- nox

uses: fluencelabs/rust-peer/.github/workflows/container.yml@master
uses: fluencelabs/nox/.github/workflows/container.yml@master
with:
image-name: "docker.fluence.dev/marine"
flavour: "minimal"
rust-peer-sha: "${{ needs.rust-peer.outputs.rust-peer-sha }}"
nox-sha: "${{ needs.nox.outputs.nox-sha }}"

rust-peer-tests:
name: "rust-peer"
nox-tests:
name: "nox"
needs:
- marine
- aquavm-crates
- spell
- decider

uses: fluencelabs/rust-peer/.github/workflows/tests.yml@master
uses: fluencelabs/nox/.github/workflows/tests.yml@master
with:
cargo-dependencies: |
[
Expand All @@ -205,6 +223,12 @@ jobs:
"version": "=${{ needs.aquavm-crates.outputs.version }}",
"registry": "fluence"
},
{
"package": "decider-distro",
"version": "=${{ needs.decider.outputs.cargo-version }}",
"manifest": "crates/system-services/Cargo.toml",
"registry": "fluence"
},
{
"package": "fluence-spell-dtos",
"version": "=${{ needs.spell.outputs.cargo-version }}",
Expand All @@ -222,13 +246,13 @@ jobs:
needs:
- marine-js
- aquavm-avm
- rust-peer-snapshot
- nox-snapshot

uses: fluencelabs/js-client/.github/workflows/tests.yml@master
with:
marine-js-version: "${{ needs.marine-js.outputs.version }}"
avm-version: "${{ needs.aquavm-avm.outputs.version }}"
rust-peer-image: "${{ needs.rust-peer-snapshot.outputs.rust-peer-image }}"
nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"

js-client:
needs:
Expand All @@ -240,45 +264,45 @@ jobs:
marine-js-version: "${{ needs.marine-js.outputs.version }}"
avm-version: "${{ needs.aquavm-avm.outputs.version }}"

fluence-cli-snapshot:
name: "fluence-cli"
flox-snapshot:
name: "flox"
needs:
- js-client

uses: fluencelabs/fluence-cli/.github/workflows/snapshot.yml@main
uses: fluencelabs/flox/.github/workflows/snapshot.yml@main
with:
js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"

aqua-playground:
aqua:
needs:
- js-client
- rust-peer-snapshot
- nox-snapshot

uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@master
uses: fluencelabs/aqua/.github/workflows/tests.yml@main
with:
js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
rust-peer-image: "${{ needs.rust-peer-snapshot.outputs.rust-peer-image }}"
nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"

spell-aqua-tests:
name: "spell"
needs:
- rust-peer-snapshot
- fluence-cli-snapshot
- nox-snapshot
- flox-snapshot
uses: fluencelabs/spell/.github/workflows/tests.yml@main
with:
rust-peer-image: "${{ needs.rust-peer-snapshot.outputs.rust-peer-image }}"
fluence-cli-version: "${{ needs.fluence-cli-snapshot.outputs.version }}"
nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
flox-version: "${{ needs.flox-snapshot.outputs.version }}"

registry:
needs:
- rust-peer-snapshot
- fluence-cli-snapshot
- nox-snapshot
- flox-snapshot
- sqlite-wasm

uses: fluencelabs/registry/.github/workflows/tests.yml@main
with:
rust-peer-image: "${{ needs.rust-peer-snapshot.outputs.rust-peer-image }}"
fluence-cli-version: "${{ needs.fluence-cli-snapshot.outputs.version }}"
nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
flox-version: "${{ needs.flox-snapshot.outputs.version }}"
cargo-dependencies: |
[
{
Expand All @@ -288,15 +312,15 @@ jobs:
}
]
fluence-cli:
flox:
needs:
- js-client
- marine
- rust-peer-snapshot
- nox-snapshot

uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@main
uses: fluencelabs/flox/.github/workflows/tests.yml@main
with:
marine-version: "${{ needs.marine.outputs.version }}"
mrepl-version: "${{ needs.marine.outputs.version }}"
rust-peer-image: "${{ needs.rust-peer-snapshot.outputs.rust-peer-image }}"
nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"

0 comments on commit 974f593

Please sign in to comment.