feat: add additional caching (#1062)

* move cli * optimize * tmp * simplify and fix * fix actions, before build * return * fix * add dir * fix? * fix * fix * Apply automatic changes * fix * fix * fix * fix * Apply automatic changes * fix * move * fix * fix * fix * cache tests * move * remove * fix * fix * fix * fix * fix * sort and turn test groups back on * remove node binaries, add github cache action * fix --------- Co-authored-by: shamsartem <[email protected]>
fluencelabs · Oct 18, 2024 · 59416e4 · 59416e4
1 parent bfd8e44
commit 59416e4
Show file tree

Hide file tree

Showing 251 changed files with 2,558 additions and 2,351 deletions.
diff --git a/.github/actions/replace-version/action.yml b/.github/actions/replace-version/action.yml
@@ -1,6 +1,6 @@
 name: Replace version
 description: |
-  Replace version in cli/src/versions.json
+  Replace version in packages/cli/package/src/versions.json
 
 inputs:
   versions:

diff --git a/.github/actions/replace-version/dist/index.js b/.github/actions/replace-version/dist/index.js
@@ -2816,7 +2816,9 @@ try {
 
   const versionsFilePath = (0,path__WEBPACK_IMPORTED_MODULE_2__.join)(
     process.env.GITHUB_WORKSPACE,
+    "packages",
     "cli",
+    "package",
     "src",
     "versions.json",
   );

diff --git a/.github/actions/replace-version/index.js b/.github/actions/replace-version/index.js
@@ -15,7 +15,9 @@ try {
 
   const versionsFilePath = join(
     process.env.GITHUB_WORKSPACE,
+    "packages",
     "cli",
+    "package",
     "src",
     "versions.json",
   );

diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,20 +1,17 @@
 {
-  "extends": [
-    "github>fluencelabs/renovate",
-    "github>fluencelabs/renovate:npm"
-  ],
+  "extends": ["github>fluencelabs/renovate", "github>fluencelabs/renovate:npm"],
   "enabledManagers": ["npm", "regex"],
   "regexManagers": [
     {
-      "fileMatch": ["^cli/src/versions\\.json$"],
+      "fileMatch": ["^packages/cli/package/src/versions\\.json$"],
       "matchStrings": [
         "\"nox\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n"
       ],
       "datasourceTemplate": "docker",
       "depNameTemplate": "nox"
     },
     {
-      "fileMatch": ["^cli/src/versions\\.json$"],
+      "fileMatch": ["^packages/cli/package/src/versions\\.json$"],
       "matchStrings": [
         "\"chain-rpc\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n",
         "\"chain-deploy-script\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n",
@@ -24,15 +21,15 @@
       "depNameTemplate": "chain"
     },
     {
-      "fileMatch": ["^cli/src/versions\\.json$"],
+      "fileMatch": ["^packages/cli/package/src/versions\\.json$"],
       "matchStrings": [
         "\"(?<depName>@fluencelabs/[^\"]+)\": \"(?<currentValue>[^\"\n]+)\""
       ],
       "matchStringsStrategy": "any",
       "datasourceTemplate": "npm"
     },
     {
-      "fileMatch": ["^cli/src/versions\\.json$"],
+      "fileMatch": ["^packages/cli/package/src/versions\\.json$"],
       "matchStrings": [
         "\"(?<depName>[marine|mrepl|marine\\-rs\\-sdk|marine\\-rs\\-sdk\\-test]+)\": \"(?<currentValue>[^\"\n]+)\""
       ],

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -36,9 +36,6 @@ jobs:
 
       - run: yarn install
 
-      - run: yarn install
-        working-directory: cli
-
       - name: Setup golang
         uses: actions/setup-go@v5
 
@@ -56,10 +53,6 @@ jobs:
       - name: Run on each commit
         run: yarn on-each-commit
 
-      - name: Run on each commit CLI
-        run: yarn on-each-commit
-        working-directory: cli
-
       - name: Format
         run: yarn format
 

diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
@@ -47,6 +47,10 @@ on:
         description: "aqua snapshots"
         type: string
         default: "null"
+      node-version:
+        description: "Node version"
+        type: string
+        default: "18.20.3"
 
 env:
   CI: true
@@ -97,23 +101,20 @@ jobs:
       - name: Setup node with self-hosted npm registry
         uses: actions/setup-node@v4
         with:
-          node-version: "18.20.3"
+          node-version: ${{ inputs.node-version }}
           registry-url: "https://npm.fluence.dev"
           cache: "yarn"
 
       - run: yarn install
 
-      - run: yarn install
-        working-directory: cli
-
       - 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: cli
+          working-directory: packages/cli/package
 
       - name: Set aqua-api version
         if: inputs.aqua-snapshots != 'null'
@@ -122,7 +123,7 @@ jobs:
           package: "@fluencelabs/aqua-api"
           version: "${{ fromJson(inputs.aqua-snapshots)['aqua-api'] }}"
           package-manager: yarn
-          working-directory: cli
+          working-directory: packages/cli/package
 
       - name: Update versions.json
         uses: ./.github/actions/replace-version
@@ -153,35 +154,36 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-turbo-
 
-      - name: Build
-        run: yarn build
-
-      - name: Build CLI
-        run: yarn build
-        working-directory: cli
+      - name: Cache node binaries
+        id: cache-node-binaries
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-node-binaries
+        with:
+          path: packages/cli/package/tmp/cache/node-v${{ inputs.node-version }}-${{ inputs.platform }}
+          key: ${{ env.cache-name }}-${{ inputs.node-version }}-${{ inputs.platform }}
 
       - name: Pack fluence-cli
         run: yarn pack-${{ inputs.platform }}
-        working-directory: cli
 
       - name: Upload fluence-cli
         if: inputs.upload-to-s3 == true
-        working-directory: cli
+        working-directory: packages/cli/package
         run: yarn upload-${{ inputs.platform }}
 
       - name: Promote fluence-cli
         if: inputs.channel != 'null' && inputs.platform != 'win32-x64'
-        working-directory: cli
+        working-directory: packages/cli/package
         run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel ${{ inputs.channel }} --no-xz --indexes
 
       - name: Promote fluence-cli windows
         if: inputs.channel != 'null' && inputs.platform == 'win32-x64'
-        working-directory: cli
+        working-directory: packages/cli/package
         run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel ${{ inputs.channel }} --no-xz --win --indexes
 
       - name: Rename archive
         if: inputs.platform != 'win32-x64'
-        run: mv cli/dist/fluence-*${{ inputs.platform }}*.tar.gz fluence-cli-${{ inputs.platform }}.tar.gz
+        run: mv packages/cli/package/dist/fluence-*${{ inputs.platform }}*.tar.gz fluence-cli-${{ inputs.platform }}.tar.gz
 
       - name: Upload archive to CI
         if: inputs.platform != 'win32-x64'
@@ -199,7 +201,7 @@ jobs:
 
       - name: Rename windows installer
         if: inputs.platform == 'win32-x64'
-        run: mv cli/dist/win32/fluence-*.exe fluence-cli-${{ inputs.platform }}.exe
+        run: mv packages/cli/package/dist/win32/fluence-*.exe fluence-cli-${{ inputs.platform }}.exe
 
       - name: Upload windows installer to CI
         if: inputs.platform == 'win32-x64'
@@ -217,10 +219,10 @@ jobs:
 
       - name: Promote fluence-cli to unstable
         if: inputs.tag != 'null' && inputs.platform != 'win32-x64'
-        working-directory: cli
+        working-directory: packages/cli/package
         run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel unstable --no-xz --indexes
 
       - name: Promote fluence-cli windows to unstable
         if: inputs.tag != 'null' && inputs.platform == 'win32-x64'
-        working-directory: cli
+        working-directory: packages/cli/package
         run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel unstable --win --no-xz --indexes
diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml
@@ -7,11 +7,11 @@ on:
         description: "Promote version to channel"
         type: choice
         options:
-          - main     # latest build from main branch
-          - stage    # version compatible with current stage env
-          - testnet  # version compatible with current testnet env
-          - stable   # latest stable version (same as mainnet)
-          - mainnet  # version compatible with current mainnet env
+          - main # latest build from main branch
+          - stage # version compatible with current stage env
+          - testnet # version compatible with current testnet env
+          - stable # latest stable version (same as mainnet)
+          - mainnet # version compatible with current mainnet env
           - unstable # version used by all CI jobs; TODO: publish automatically on every release
         required: true
 
@@ -57,12 +57,12 @@ jobs:
           cache: "yarn"
 
       - run: yarn install
-        working-directory: cli
+        working-directory: packages/cli/package
 
       - name: Promote fluence-cli
-        working-directory: cli
+        working-directory: packages/cli/package
         run: yarn oclif promote -t linux-x64,darwin-x64,darwin-arm64 --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel ${{ inputs.channel }} --no-xz --indexes
 
       - name: Promote fluence-cli windows
-        working-directory: cli
+        working-directory: packages/cli/package
         run: yarn oclif promote -t win32-x64 --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel ${{ inputs.channel }} --no-xz --win --indexes
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -39,6 +39,10 @@ on:
         description: "@fluencelabs/installation-spell version"
         type: string
         default: "null"
+      node-version:
+        description: "Node version"
+        type: string
+        default: "18.20.3"
 
 env:
   CI: true
@@ -99,17 +103,14 @@ jobs:
 
       - run: yarn install
 
-      - run: yarn install
-        working-directory: cli
-
       - 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: cli
+          working-directory: packages/cli/package
 
       - name: Set aqua-api version
         if: inputs.aqua-snapshots != 'null'
@@ -118,7 +119,7 @@ jobs:
           package: "@fluencelabs/aqua-api"
           version: "${{ fromJson(inputs.aqua-snapshots)['aqua-api'] }}"
           package-manager: yarn
-          working-directory: cli
+          working-directory: packages/cli/package
 
       - name: Set installation-spell version
         if: inputs.installation-spell-version != 'null'
@@ -128,7 +129,7 @@ jobs:
           version: "${{ inputs.installation-spell-version }}"
           package-manager: yarn
           flags: "--dev"
-          working-directory: cli
+          working-directory: packages/cli/package
 
       - name: Update versions.json
         uses: ./.github/actions/replace-version
@@ -158,16 +159,26 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-turbo-
 
-      - name: Build
-        run: yarn build
-
-      - name: Build CLI
-        run: yarn build
-        working-directory: cli
+      - name: Cache node binaries linux-x64
+        id: cache-node-binaries-linux-x64
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-node-binaries
+        with:
+          path: packages/cli/package/tmp/cache/node-v${{ inputs.node-version }}-linux-x64
+          key: ${{ env.cache-name }}-${{ inputs.node-version }}-linux-x64
+
+      - name: Cache node binaries darwin-arm64
+        id: cache-node-binaries-darwin-arm64
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-node-binaries
+        with:
+          path: packages/cli/package/tmp/cache/node-v${{ inputs.node-version }}-darwin-arm64
+          key: ${{ env.cache-name }}-${{ inputs.node-version }}-darwin-arm64
 
       - name: Pack Fluence CLI for Linux and macOS
         run: yarn pack-ci
-        working-directory: cli
 
       - name: Upload linux-x64 to CI checks
         uses: actions/upload-artifact@v4