Skip to content

Commit d12ed09

Browse files
shamsartemnahsi
andauthored
feat!: remove all developer functionality, add kubernetes manifest generation and deployment (#1076)
* feat: remove all developer functionality * Apply automatic changes * fix? * F * remove old commands * remove old config docs * feat!: generate manifests, rename nox to peer (#1077) * feat: generate manifests * Apply automatic changes * fix test, rename nox to peer * allow selecting by both peers and offers in all commands * Apply automatic changes * add manifest apply * use fork instead of patch (patch doesn't work with oclif pack) * fix peerId * remove ccp configs * fix? * fix * give a better name to converter * rename nox to peer * Apply automatic changes * improve description. require at least one item in supply if resources is specified, add validation on deploy * Apply automatic changes * feat!: remove nox and js-client (#1078) * feat: remove nox * Apply automatic changes * remove js-client * restore description for local group of commands --------- Co-authored-by: shamsartem <[email protected]> --------- Co-authored-by: shamsartem <[email protected]> --------- Co-authored-by: shamsartem <[email protected]> Co-authored-by: Anatolios Laskaris <[email protected]>
1 parent 99a4caf commit d12ed09

File tree

197 files changed

+1591
-31376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+1591
-31376
lines changed

.github/actions/replace-version/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ inputs:
77
type: string
88

99
runs:
10-
using: "node16"
10+
using: "node20"
1111
main: "dist/index.js"

.github/renovate.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
"extends": ["github>fluencelabs/renovate", "github>fluencelabs/renovate:npm"],
33
"enabledManagers": ["npm", "regex"],
44
"regexManagers": [
5-
{
6-
"fileMatch": ["^packages/cli/package/src/versions\\.json$"],
7-
"matchStrings": [
8-
"\"nox\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n"
9-
],
10-
"datasourceTemplate": "docker",
11-
"depNameTemplate": "nox"
12-
},
135
{
146
"fileMatch": ["^packages/cli/package/src/versions\\.json$"],
157
"matchStrings": [
@@ -27,14 +19,6 @@
2719
],
2820
"matchStringsStrategy": "any",
2921
"datasourceTemplate": "npm"
30-
},
31-
{
32-
"fileMatch": ["^packages/cli/package/src/versions\\.json$"],
33-
"matchStrings": [
34-
"\"(?<depName>[marine|mrepl|marine\\-rs\\-sdk|marine\\-rs\\-sdk\\-test]+)\": \"(?<currentValue>[^\"\n]+)\""
35-
],
36-
"matchStringsStrategy": "any",
37-
"datasourceTemplate": "crate"
3822
}
3923
],
4024
"packageRules": [

.github/workflows/pack.yml

Lines changed: 3 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,6 @@ on:
2323
description: "Promote version to channel"
2424
type: string
2525
default: "null"
26-
marine-version:
27-
description: "marine version"
28-
type: string
29-
default: "null"
30-
mrepl-version:
31-
description: "mrepl version"
32-
type: string
33-
default: "null"
34-
marine-rs-sdk-version:
35-
description: "marine-rs-sdk version"
36-
type: string
37-
default: "null"
38-
marine-rs-sdk-test-version:
39-
description: "marine-rs-sdk-test version"
40-
type: string
41-
default: "null"
42-
js-client-snapshots:
43-
description: "js-client snapshots"
44-
type: string
45-
default: "null"
46-
aqua-snapshots:
47-
description: "aqua snapshots"
48-
type: string
49-
default: "null"
5026
node-version:
5127
description: "Node version"
5228
type: string
@@ -91,13 +67,9 @@ jobs:
9167
exportToken: false
9268
secrets: |
9369
kv/npm-registry/basicauth/ci token | NODE_AUTH_TOKEN;
94-
kv/cargo-registry/users/ci token | CARGO_REGISTRIES_FLUENCE_TOKEN;
9570
kv/ci/fcli-binaries id | AWS_ACCESS_KEY_ID ;
9671
kv/ci/fcli-binaries secret | AWS_SECRET_ACCESS_KEY
9772
98-
- name: Setup Rust toolchain
99-
uses: actions-rust-lang/setup-rust-toolchain@v1
100-
10173
- name: Setup node with self-hosted npm registry
10274
uses: actions/setup-node@v4
10375
with:
@@ -107,40 +79,6 @@ jobs:
10779

10880
- run: yarn install
10981

110-
- name: Set js-client version
111-
if: inputs.js-client-snapshots != 'null'
112-
uses: fluencelabs/github-actions/npm-set-dependency@main
113-
with:
114-
package: "@fluencelabs/js-client"
115-
version: ${{ fromJson(inputs.js-client-snapshots)['js-client'] }}
116-
package-manager: yarn
117-
working-directory: packages/cli/package
118-
119-
- name: Set aqua-api version
120-
if: inputs.aqua-snapshots != 'null'
121-
uses: fluencelabs/github-actions/npm-set-dependency@main
122-
with:
123-
package: "@fluencelabs/aqua-api"
124-
version: "${{ fromJson(inputs.aqua-snapshots)['aqua-api'] }}"
125-
package-manager: yarn
126-
working-directory: packages/cli/package
127-
128-
- name: Update versions.json
129-
uses: ./.github/actions/replace-version
130-
with:
131-
versions: |
132-
{
133-
"npm": {
134-
"@fluencelabs/js-client": "${{ inputs.js-client-snapshots == 'null' && 'null' || fromJson(inputs.js-client-snapshots)['js-client'] }}"
135-
},
136-
"cargo": {
137-
"marine": "${{ inputs.marine-version }}",
138-
"mrepl": "${{ inputs.mrepl-version }}",
139-
"marine-rs-sdk": "${{ inputs.marine-rs-sdk-version }}",
140-
"marine-rs-sdk-test": "${{ inputs.marine-rs-sdk-test-version }}"
141-
}
142-
}
143-
14482
- name: Generate snapshot version
14583
if: inputs.upload-to-s3 != true
14684
id: version
@@ -156,7 +94,7 @@ jobs:
15694
15795
- name: Cache node binaries
15896
id: cache-node-binaries
159-
uses: actions/cache@v3
97+
uses: actions/cache@v4
16098
env:
16199
cache-name: cache-node-binaries
162100
with:
@@ -194,7 +132,7 @@ jobs:
194132

195133
- name: Upload archive to release
196134
if: inputs.tag != 'null' && inputs.platform != 'win32-x64'
197-
uses: softprops/action-gh-release@v1
135+
uses: softprops/action-gh-release@v2
198136
with:
199137
files: fluence-cli-${{ inputs.platform }}.tar.gz
200138
tag_name: ${{ inputs.tag }}
@@ -212,7 +150,7 @@ jobs:
212150

213151
- name: Upload windows installer to release
214152
if: inputs.tag != 'null' && inputs.platform == 'win32-x64'
215-
uses: softprops/action-gh-release@v1
153+
uses: softprops/action-gh-release@v2
216154
with:
217155
files: fluence-cli-${{ inputs.platform }}.exe
218156
tag_name: ${{ inputs.tag }}

.github/workflows/snapshot.yml

Lines changed: 2 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,6 @@ on:
77
description: "Git ref to checkout to"
88
type: string
99
default: "main"
10-
marine-version:
11-
description: "marine version"
12-
type: string
13-
default: "null"
14-
mrepl-version:
15-
description: "mrepl version"
16-
type: string
17-
default: "null"
18-
marine-rs-sdk-version:
19-
description: "marine-rs-sdk version"
20-
type: string
21-
default: "null"
22-
marine-rs-sdk-test-version:
23-
description: "marine-rs-sdk-test version"
24-
type: string
25-
default: "null"
26-
js-client-snapshots:
27-
description: "js-client snapshots"
28-
type: string
29-
default: "null"
30-
aqua-snapshots:
31-
description: "aqua snapshots"
32-
type: string
33-
default: "null"
34-
spell-version:
35-
description: "@fluencelabs/spell version"
36-
type: string
37-
default: "null"
38-
installation-spell-version:
39-
description: "@fluencelabs/installation-spell version"
40-
type: string
41-
default: "null"
4210
node-version:
4311
description: "Node version"
4412
type: string
@@ -81,13 +49,9 @@ jobs:
8149
exportToken: false
8250
secrets: |
8351
kv/npm-registry/basicauth/ci token | NODE_AUTH_TOKEN;
84-
kv/cargo-registry/users/ci token | CARGO_REGISTRIES_FLUENCE_TOKEN;
8552
kv/ci/fcli-binaries id | AWS_ACCESS_KEY_ID ;
8653
kv/ci/fcli-binaries secret | AWS_SECRET_ACCESS_KEY
8754
88-
- name: Setup Rust toolchain
89-
uses: actions-rust-lang/setup-rust-toolchain@v1
90-
9155
- name: Setup node with self-hosted npm registry
9256
uses: actions/setup-node@v4
9357
with:
@@ -103,50 +67,6 @@ jobs:
10367
10468
- run: yarn install
10569

106-
- name: Set js-client version
107-
if: inputs.js-client-snapshots != 'null'
108-
uses: fluencelabs/github-actions/npm-set-dependency@main
109-
with:
110-
package: "@fluencelabs/js-client"
111-
version: ${{ fromJson(inputs.js-client-snapshots)['js-client'] }}
112-
package-manager: yarn
113-
working-directory: packages/cli/package
114-
115-
- name: Set aqua-api version
116-
if: inputs.aqua-snapshots != 'null'
117-
uses: fluencelabs/github-actions/npm-set-dependency@main
118-
with:
119-
package: "@fluencelabs/aqua-api"
120-
version: "${{ fromJson(inputs.aqua-snapshots)['aqua-api'] }}"
121-
package-manager: yarn
122-
working-directory: packages/cli/package
123-
124-
- name: Set installation-spell version
125-
if: inputs.installation-spell-version != 'null'
126-
uses: fluencelabs/github-actions/npm-set-dependency@main
127-
with:
128-
package: "@fluencelabs/installation-spell"
129-
version: "${{ inputs.installation-spell-version }}"
130-
package-manager: yarn
131-
flags: "--dev"
132-
working-directory: packages/cli/package
133-
134-
- name: Update versions.json
135-
uses: ./.github/actions/replace-version
136-
with:
137-
versions: |
138-
{
139-
"npm": {
140-
"@fluencelabs/spell": "${{ inputs.spell-version == 'null' && 'null' || inputs.spell-version }}"
141-
},
142-
"cargo": {
143-
"marine": "${{ inputs.marine-version }}",
144-
"mrepl": "${{ inputs.mrepl-version }}",
145-
"marine-rs-sdk": "${{ inputs.marine-rs-sdk-version }}",
146-
"marine-rs-sdk-test": "${{ inputs.marine-rs-sdk-test-version }}"
147-
}
148-
}
149-
15070
- name: Generate snapshot version
15171
id: version
15272
uses: fluencelabs/github-actions/generate-snapshot-id@main
@@ -161,7 +81,7 @@ jobs:
16181
16282
- name: Cache node binaries linux-x64
16383
id: cache-node-binaries-linux-x64
164-
uses: actions/cache@v3
84+
uses: actions/cache@v4
16585
env:
16686
cache-name: cache-node-binaries
16787
with:
@@ -170,7 +90,7 @@ jobs:
17090

17191
- name: Cache node binaries darwin-arm64
17292
id: cache-node-binaries-darwin-arm64
173-
uses: actions/cache@v3
93+
uses: actions/cache@v4
17494
env:
17595
cache-name: cache-node-binaries
17696
with:

0 commit comments

Comments
 (0)