Skip to content

Commit

Permalink
feat!: remove all developer functionality, add kubernetes manifest ge…
Browse files Browse the repository at this point in the history
…neration 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]>
  • Loading branch information
3 people authored Dec 20, 2024
1 parent 99a4caf commit d12ed09
Show file tree
Hide file tree
Showing 197 changed files with 1,591 additions and 31,376 deletions.
2 changes: 1 addition & 1 deletion .github/actions/replace-version/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ inputs:
type: string

runs:
using: "node16"
using: "node20"
main: "dist/index.js"
16 changes: 0 additions & 16 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"extends": ["github>fluencelabs/renovate", "github>fluencelabs/renovate:npm"],
"enabledManagers": ["npm", "regex"],
"regexManagers": [
{
"fileMatch": ["^packages/cli/package/src/versions\\.json$"],
"matchStrings": [
"\"nox\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n"
],
"datasourceTemplate": "docker",
"depNameTemplate": "nox"
},
{
"fileMatch": ["^packages/cli/package/src/versions\\.json$"],
"matchStrings": [
Expand All @@ -27,14 +19,6 @@
],
"matchStringsStrategy": "any",
"datasourceTemplate": "npm"
},
{
"fileMatch": ["^packages/cli/package/src/versions\\.json$"],
"matchStrings": [
"\"(?<depName>[marine|mrepl|marine\\-rs\\-sdk|marine\\-rs\\-sdk\\-test]+)\": \"(?<currentValue>[^\"\n]+)\""
],
"matchStringsStrategy": "any",
"datasourceTemplate": "crate"
}
],
"packageRules": [
Expand Down
68 changes: 3 additions & 65 deletions .github/workflows/pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,6 @@ on:
description: "Promote version to channel"
type: string
default: "null"
marine-version:
description: "marine version"
type: string
default: "null"
mrepl-version:
description: "mrepl version"
type: string
default: "null"
marine-rs-sdk-version:
description: "marine-rs-sdk version"
type: string
default: "null"
marine-rs-sdk-test-version:
description: "marine-rs-sdk-test version"
type: string
default: "null"
js-client-snapshots:
description: "js-client snapshots"
type: string
default: "null"
aqua-snapshots:
description: "aqua snapshots"
type: string
default: "null"
node-version:
description: "Node version"
type: string
Expand Down Expand Up @@ -91,13 +67,9 @@ jobs:
exportToken: false
secrets: |
kv/npm-registry/basicauth/ci token | NODE_AUTH_TOKEN;
kv/cargo-registry/users/ci token | CARGO_REGISTRIES_FLUENCE_TOKEN;
kv/ci/fcli-binaries id | AWS_ACCESS_KEY_ID ;
kv/ci/fcli-binaries secret | AWS_SECRET_ACCESS_KEY
- name: Setup Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Setup node with self-hosted npm registry
uses: actions/setup-node@v4
with:
Expand All @@ -107,40 +79,6 @@ jobs:

- run: yarn install

- name: Set js-client version
if: inputs.js-client-snapshots != 'null'
uses: fluencelabs/github-actions/npm-set-dependency@main
with:
package: "@fluencelabs/js-client"
version: ${{ fromJson(inputs.js-client-snapshots)['js-client'] }}
package-manager: yarn
working-directory: packages/cli/package

- name: Set aqua-api version
if: inputs.aqua-snapshots != 'null'
uses: fluencelabs/github-actions/npm-set-dependency@main
with:
package: "@fluencelabs/aqua-api"
version: "${{ fromJson(inputs.aqua-snapshots)['aqua-api'] }}"
package-manager: yarn
working-directory: packages/cli/package

- name: Update versions.json
uses: ./.github/actions/replace-version
with:
versions: |
{
"npm": {
"@fluencelabs/js-client": "${{ inputs.js-client-snapshots == 'null' && 'null' || fromJson(inputs.js-client-snapshots)['js-client'] }}"
},
"cargo": {
"marine": "${{ inputs.marine-version }}",
"mrepl": "${{ inputs.mrepl-version }}",
"marine-rs-sdk": "${{ inputs.marine-rs-sdk-version }}",
"marine-rs-sdk-test": "${{ inputs.marine-rs-sdk-test-version }}"
}
}
- name: Generate snapshot version
if: inputs.upload-to-s3 != true
id: version
Expand All @@ -156,7 +94,7 @@ jobs:
- name: Cache node binaries
id: cache-node-binaries
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-binaries
with:
Expand Down Expand Up @@ -194,7 +132,7 @@ jobs:

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

- name: Upload windows installer to release
if: inputs.tag != 'null' && inputs.platform == 'win32-x64'
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: fluence-cli-${{ inputs.platform }}.exe
tag_name: ${{ inputs.tag }}
Expand Down
84 changes: 2 additions & 82 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,6 @@ on:
description: "Git ref to checkout to"
type: string
default: "main"
marine-version:
description: "marine version"
type: string
default: "null"
mrepl-version:
description: "mrepl version"
type: string
default: "null"
marine-rs-sdk-version:
description: "marine-rs-sdk version"
type: string
default: "null"
marine-rs-sdk-test-version:
description: "marine-rs-sdk-test version"
type: string
default: "null"
js-client-snapshots:
description: "js-client snapshots"
type: string
default: "null"
aqua-snapshots:
description: "aqua snapshots"
type: string
default: "null"
spell-version:
description: "@fluencelabs/spell version"
type: string
default: "null"
installation-spell-version:
description: "@fluencelabs/installation-spell version"
type: string
default: "null"
node-version:
description: "Node version"
type: string
Expand Down Expand Up @@ -81,13 +49,9 @@ jobs:
exportToken: false
secrets: |
kv/npm-registry/basicauth/ci token | NODE_AUTH_TOKEN;
kv/cargo-registry/users/ci token | CARGO_REGISTRIES_FLUENCE_TOKEN;
kv/ci/fcli-binaries id | AWS_ACCESS_KEY_ID ;
kv/ci/fcli-binaries secret | AWS_SECRET_ACCESS_KEY
- name: Setup Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1

- name: Setup node with self-hosted npm registry
uses: actions/setup-node@v4
with:
Expand All @@ -103,50 +67,6 @@ jobs:
- run: yarn install

- name: Set js-client version
if: inputs.js-client-snapshots != 'null'
uses: fluencelabs/github-actions/npm-set-dependency@main
with:
package: "@fluencelabs/js-client"
version: ${{ fromJson(inputs.js-client-snapshots)['js-client'] }}
package-manager: yarn
working-directory: packages/cli/package

- name: Set aqua-api version
if: inputs.aqua-snapshots != 'null'
uses: fluencelabs/github-actions/npm-set-dependency@main
with:
package: "@fluencelabs/aqua-api"
version: "${{ fromJson(inputs.aqua-snapshots)['aqua-api'] }}"
package-manager: yarn
working-directory: packages/cli/package

- name: Set installation-spell version
if: inputs.installation-spell-version != 'null'
uses: fluencelabs/github-actions/npm-set-dependency@main
with:
package: "@fluencelabs/installation-spell"
version: "${{ inputs.installation-spell-version }}"
package-manager: yarn
flags: "--dev"
working-directory: packages/cli/package

- name: Update versions.json
uses: ./.github/actions/replace-version
with:
versions: |
{
"npm": {
"@fluencelabs/spell": "${{ inputs.spell-version == 'null' && 'null' || inputs.spell-version }}"
},
"cargo": {
"marine": "${{ inputs.marine-version }}",
"mrepl": "${{ inputs.mrepl-version }}",
"marine-rs-sdk": "${{ inputs.marine-rs-sdk-version }}",
"marine-rs-sdk-test": "${{ inputs.marine-rs-sdk-test-version }}"
}
}
- name: Generate snapshot version
id: version
uses: fluencelabs/github-actions/generate-snapshot-id@main
Expand All @@ -161,7 +81,7 @@ jobs:
- name: Cache node binaries linux-x64
id: cache-node-binaries-linux-x64
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-binaries
with:
Expand All @@ -170,7 +90,7 @@ jobs:

- name: Cache node binaries darwin-arm64
id: cache-node-binaries-darwin-arm64
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-binaries
with:
Expand Down
Loading

0 comments on commit d12ed09

Please sign in to comment.