Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit dd7f4b6

Browse files
nahsinahsi
authored
chore: Update e2e (#273)
* Update e2e * Fixes
1 parent baf367e commit dd7f4b6

File tree

6 files changed

+200
-170
lines changed

6 files changed

+200
-170
lines changed

.github/workflows/e2e.yml.disabled renamed to .github/workflows/e2e.yml

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,58 +24,28 @@ concurrency:
2424

2525
jobs:
2626
tests:
27-
name: "fluence-js"
27+
name: "js-client"
2828
uses: ./.github/workflows/tests.yml
2929
with:
3030
ref: ${{ github.ref }}
3131

32-
fluence-js:
32+
js-client:
3333
uses: ./.github/workflows/snapshot.yml
3434
with:
3535
ref: ${{ github.ref }}
3636

37-
aqua:
38-
needs:
39-
- fluence-js
40-
41-
uses: fluencelabs/aqua/.github/workflows/snapshot.yml@main
42-
with:
43-
fluence-js-version: "${{ needs.fluence-js.outputs.fluence-js-version }}"
44-
4537
aqua-playground:
4638
needs:
47-
- fluence-js
48-
- aqua
49-
50-
uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@master
51-
with:
52-
fluence-js-version: "${{ needs.fluence-js.outputs.fluence-js-version }}"
53-
aqua-version: "${{ needs.aqua.outputs.aqua-version }}"
54-
55-
registry:
56-
needs:
57-
- aqua
58-
59-
uses: fluencelabs/registry/.github/workflows/tests.yml@main
60-
with:
61-
aqua-version: "${{ needs.aqua.outputs.aqua-version }}"
62-
63-
fluence-cli:
64-
needs:
65-
- fluence-js
66-
- aqua
39+
- js-client
6740

68-
uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@main
41+
uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@FLU-274
6942
with:
70-
aqua-version: "${{ needs.aqua.outputs.aqua-version }}"
71-
fluence-js-version: "${{ needs.fluence-js.outputs.fluence-js-version }}"
43+
js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
7244

7345
status:
7446
runs-on: ubuntu-latest
7547
if: always()
7648
needs:
77-
- fluence-cli
78-
- registry
7949
- aqua-playground
8050

8151
steps:

‎.github/workflows/run-tests.yml‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎.github/workflows/snapshot.yml‎

Lines changed: 90 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ on:
1414
ref:
1515
description: "git ref to checkout to"
1616
type: string
17-
default: "v0.28.0"
17+
default: "master"
1818
outputs:
19-
fluence-js-version:
20-
description: "@fluencelabs/fluence version"
21-
value: ${{ jobs.publish-snapshot.outputs.fluence-js-version }}
19+
js-client-snapshots:
20+
description: "js-client snapshots"
21+
value: ${{ jobs.publish-snapshot.outputs.snapshots }}
2222

2323
env:
2424
FORCE_COLOR: true
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131

3232
outputs:
33-
fluence-js-version: "${{ steps.snapshot.outputs.version }}"
33+
snapshots: "${{ steps.snapshot.outputs.snapshots }}"
3434

3535
permissions:
3636
contents: read
@@ -56,22 +56,100 @@ jobs:
5656

5757
- run: pnpm i
5858

59-
- name: Set avm version
59+
- name: Set avm version in core/interfaces
6060
if: inputs.avm-version != 'null'
6161
uses: fluencelabs/github-actions/npm-set-dependency@main
6262
with:
6363
package: "@fluencelabs/avm"
6464
version: ${{ inputs.avm-version }}
65-
working-directory: packages/fluence-js
65+
working-directory: packages/core/interfaces
6666
package-manager: pnpm
67+
flags: "--save --dev"
6768

68-
- name: Set marine-js version
69+
- name: Set marine-js version in core/interfaces
6970
if: inputs.marine-js-version != 'null'
7071
uses: fluencelabs/github-actions/npm-set-dependency@main
7172
with:
7273
package: "@fluencelabs/marine-js"
7374
version: ${{ inputs.marine-js-version }}
74-
working-directory: packages/fluence-js
75+
working-directory: packages/core/interfaces
76+
package-manager: pnpm
77+
flags: "--save --dev"
78+
79+
- name: Set avm version in core/js-peer
80+
if: inputs.avm-version != 'null'
81+
uses: fluencelabs/github-actions/npm-set-dependency@main
82+
with:
83+
package: "@fluencelabs/avm"
84+
version: ${{ inputs.avm-version }}
85+
working-directory: packages/core/js-peer
86+
package-manager: pnpm
87+
88+
- name: Set marine-js version in core/js-peer
89+
if: inputs.marine-js-version != 'null'
90+
uses: fluencelabs/github-actions/npm-set-dependency@main
91+
with:
92+
package: "@fluencelabs/marine-js"
93+
version: ${{ inputs.marine-js-version }}
94+
working-directory: packages/core/js-peer
95+
package-manager: pnpm
96+
97+
- name: Set avm version in client/api
98+
if: inputs.avm-version != 'null'
99+
uses: fluencelabs/github-actions/npm-set-dependency@main
100+
with:
101+
package: "@fluencelabs/avm"
102+
version: ${{ inputs.avm-version }}
103+
working-directory: packages/client/api
104+
package-manager: pnpm
105+
flags: "--save --dev"
106+
107+
- name: Set marine-js version in client/api
108+
if: inputs.marine-js-version != 'null'
109+
uses: fluencelabs/github-actions/npm-set-dependency@main
110+
with:
111+
package: "@fluencelabs/marine-js"
112+
version: ${{ inputs.marine-js-version }}
113+
working-directory: packages/client/api
114+
package-manager: pnpm
115+
flags: "--save --dev"
116+
117+
- name: Set avm version in client/js-client.web
118+
if: inputs.avm-version != 'null'
119+
uses: fluencelabs/github-actions/npm-set-dependency@main
120+
with:
121+
package: "@fluencelabs/avm"
122+
version: ${{ inputs.avm-version }}
123+
working-directory: packages/client/js-client.web.standalone
124+
package-manager: pnpm
125+
flags: "--save --dev"
126+
127+
- name: Set marine-js version in client/js-client.web
128+
if: inputs.marine-js-version != 'null'
129+
uses: fluencelabs/github-actions/npm-set-dependency@main
130+
with:
131+
package: "@fluencelabs/marine-js"
132+
version: ${{ inputs.marine-js-version }}
133+
working-directory: packages/client/js-client.web.standalone
134+
package-manager: pnpm
135+
flags: "--save --dev"
136+
137+
- name: Set avm version in client/js-client.node
138+
if: inputs.avm-version != 'null'
139+
uses: fluencelabs/github-actions/npm-set-dependency@main
140+
with:
141+
package: "@fluencelabs/avm"
142+
version: ${{ inputs.avm-version }}
143+
working-directory: packages/client/js-client.node
144+
package-manager: pnpm
145+
146+
- name: Set marine-js version in client/js-client.node
147+
if: inputs.marine-js-version != 'null'
148+
uses: fluencelabs/github-actions/npm-set-dependency@main
149+
with:
150+
package: "@fluencelabs/marine-js"
151+
version: ${{ inputs.marine-js-version }}
152+
working-directory: packages/client/js-client.node
75153
package-manager: pnpm
76154

77155
- name: Import secrets
@@ -92,15 +170,13 @@ jobs:
92170
uses: fluencelabs/github-actions/generate-snapshot-id@main
93171

94172
- name: Set package version
95-
run: node ci.js bump-version ${{ steps.version.outputs.id }}
173+
run: node ci.cjs bump-version ${{ steps.version.outputs.id }}
96174

97175
- run: pnpm -r build
98176

99177
- name: Publish snapshots
100178
id: snapshot
101-
uses: fluencelabs/github-actions/npm-publish-snapshot@main
179+
uses: fluencelabs/github-actions/pnpm-publish-snapshot@main
102180
with:
103-
working-directory: packages/fluence-js
104181
id: ${{ steps.version.outputs.id }}
105-
package-manager: pnpm
106-
flags: "-r --registry https://npm.fluence.dev --no-git-checks --tag snapsot -filter '@fluencelabs/*'"
182+
flags: "-r --registry https://npm.fluence.dev --no-git-checks --tag snapshot -filter '@fluencelabs/*'"

0 commit comments

Comments
 (0)