Release/2.60.0 to latest

.circleci/build/build.sh

@@ -6,6 +6,7 @@ yarn
 yarn --cwd redisinsight/api
 
 # build
+
 yarn build:statics
 yarn build:ui
 yarn --cwd ./redisinsight/api build:prod

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.58.0)
+-v - Semver (2.60.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.circleci/config.yml

@@ -121,7 +121,8 @@ aliases:
     - oss-st-5            # OSS Standalone v5
     - oss-st-5-pass       # OSS Standalone v5 with admin pass required
     - oss-st-6            # OSS Standalone v6 and all modules
-    - oss-st-big          # OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M)
+    # TODO: Investigate why it randomly fails
+    # - oss-st-big          # OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M)
     - mods-preview        # OSS Standalone and all preview modules
     - oss-st-6-tls        # OSS Standalone v6 with TLS enabled
     - oss-st-6-tls-auth   # OSS Standalone v6 with TLS auth required
@@ -213,6 +214,9 @@ parameters:
   redis_client:
     type: string
     default: ""
+  env:
+    type: string
+    default: "stage"
 
 jobs:
   # Test jobs
@@ -1351,24 +1355,24 @@ workflows:
           os: linux
           target: << pipeline.parameters.linux >>
       - setup-sign-certificates:
-          name: Setup sign certificates (stage)
+          name: Setup sign certificates (<< pipeline.parameters.env >>)
           requires:
             - Validating build parameters
       - setup-build:
-          name: Setup build (stage)
-          env: stage
+          name: Setup build (<< pipeline.parameters.env >>)
+          env:  << pipeline.parameters.env >>
           requires:
-            - Setup sign certificates (stage)
+            - Setup sign certificates (<< pipeline.parameters.env >>)
       - linux:
-          name: Build app - Linux (stage)
-          env: stage
+          name: Build app - Linux (<< pipeline.parameters.env >>)
+          env: << pipeline.parameters.env >>
           target: << pipeline.parameters.linux >>
           requires:
-            - Setup build (stage)
+            - Setup build (<< pipeline.parameters.env >>)
       - store-build-artifacts:
-          name: Store build artifacts (stage)
+          name: Store build artifacts (<< pipeline.parameters.env >>)
           requires:
-            - Build app - Linux (stage)
+            - Build app - Linux (<< pipeline.parameters.env >>)
   manual-build-mac:
     when: << pipeline.parameters.mac >>
     jobs:
@@ -1377,25 +1381,25 @@ workflows:
           os: mac
           target: << pipeline.parameters.mac >>
       - setup-sign-certificates:
-          name: Setup sign certificates (stage)
+          name: Setup sign certificates (<< pipeline.parameters.env >>)
           requires:
             - Validating build parameters
       - setup-build:
-          name: Setup build (stage)
-          env: stage
+          name: Setup build (<< pipeline.parameters.env >>)
+          env: << pipeline.parameters.env >>
           requires:
-            - Setup sign certificates (stage)
+            - Setup sign certificates (<< pipeline.parameters.env >>)
       - macosx:
-          name: Build app - MacOS (stage)
-          env: stage
+          name: Build app - MacOS (<< pipeline.parameters.env >>)
+          env: << pipeline.parameters.env >>
           redisstack: false
           target: << pipeline.parameters.mac >>
           requires:
-            - Setup build (stage)
+            - Setup build (<< pipeline.parameters.env >>)
       - store-build-artifacts:
-          name: Store build artifacts (stage)
+          name: Store build artifacts (<< pipeline.parameters.env >>)
           requires:
-            - Build app - MacOS (stage)
+            - Build app - MacOS (<< pipeline.parameters.env >>)
   manual-build-windows:
     when: << pipeline.parameters.windows >>
     jobs:
@@ -1404,24 +1408,24 @@ workflows:
           os: windows
           target: << pipeline.parameters.windows >>
       - setup-sign-certificates:
-          name: Setup sign certificates (stage)
+          name: Setup sign certificates (<< pipeline.parameters.env >>)
           requires:
             - Validating build parameters
       - setup-build:
-          name: Setup build (stage)
-          env: stage
+          name: Setup build (<< pipeline.parameters.env >>)
+          env: << pipeline.parameters.env >>
           requires:
-            - Setup sign certificates (stage)
+            - Setup sign certificates (<< pipeline.parameters.env >>)
       - windows:
-          name: Build app - Windows (stage)
-          env: stage
+          name: Build app - Windows (<< pipeline.parameters.env >>)
+          env: << pipeline.parameters.env >>
           target: << pipeline.parameters.windows >>
           requires:
-            - Setup build (stage)
+            - Setup build (<< pipeline.parameters.env >>)
       - store-build-artifacts:
-          name: Store build artifacts (stage)
+          name: Store build artifacts (<< pipeline.parameters.env >>)
           requires:
-            - Build app - Windows (stage)
+            - Build app - Windows (<< pipeline.parameters.env >>)
   manual-build-docker:
     when: << pipeline.parameters.docker >>
     jobs:
@@ -1430,22 +1434,22 @@ workflows:
           os: docker
           target: << pipeline.parameters.docker >>
       - setup-sign-certificates:
-          name: Setup sign certificates (stage)
+          name: Setup sign certificates (<< pipeline.parameters.env >>)
           requires:
             - Validating build parameters
       - setup-build:
-          name: Setup build (stage)
-          env: stage
+          name: Setup build (<< pipeline.parameters.env >>)
+          env: << pipeline.parameters.env >>
           requires:
-            - Setup sign certificates (stage)
+            - Setup sign certificates (<< pipeline.parameters.env >>)
       - docker:
-          name: Build docker images (stage)
+          name: Build docker images (<< pipeline.parameters.env >>)
           requires:
-            - Setup build (stage)
+            - Setup build (<< pipeline.parameters.env >>)
       - store-build-artifacts:
-          name: Store build artifacts (stage)
+          name: Store build artifacts (<< pipeline.parameters.env >>)
           requires:
-            - Build docker images (stage)
+            - Build docker images (<< pipeline.parameters.env >>)
 
   # build electron app (dev) from "build" branches
   build:

.github/actions/install-all-build-libs/action.yml

@@ -0,0 +1,85 @@
+name: Install all libraries action
+description: Install all libraries and dependencies
+inputs:
+  skip-electron-deps:
+    description:  Skip install electron dependencies
+    default: '0'
+    required: false
+
+  skip-backend-deps:
+    description:  Skip install backend dependencies
+    default: '0'
+    required: false
+
+  skip-postinstall:
+    description:  Skip postinstall
+    default: '0'
+    required: false
+
+  keytar-host-mirror:
+    description: Keytar binary host mirror
+    required: false
+
+  sqlite3-host-mirror:
+    description: SQLite3 binary host mirror
+    required: false
+
+#TODO: check !contains
+
+runs:
+  using: 'composite'
+  steps:
+    # OS libraries
+    - name: Setup Node
+      uses: actions/setup-node@v4.0.4
+      with:
+        node-version: '20.15'
+        # disable cache for windows
+        # https://github.com/actions/setup-node/issues/975
+        cache: ${{ runner.os != 'Windows' && 'yarn' || '' }}
+        cache-dependency-path: ${{ runner.os != 'Windows' && '**/yarn.lock' || '' }}
+
+    - name: Setup Python
+      # if: ${{ contains(inputs.skip-electron-deps, '1') }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
+    - name: Install linux libraries
+      if: ${{ runner.os == 'Linux' }}
+      # if: ${{ runner.os == 'Linux' && !contains(inputs.skip-electron-deps, '1') }}
+      shell: bash
+      run: |
+        sudo apt-get update -qy
+        sudo apt-get install -qy libsecret-1-dev rpm
+
+    - name: Install macos libraries
+      if: ${{ runner.os == 'macOS' }}
+      # if: ${{ runner.os == 'macOS' && !contains(inputs.skip-electron-deps, '1') }}
+      shell: bash
+      run: |
+        brew install libsecret
+
+    # TODO: matrix?
+    # Javascript dependencies
+    - name: Install dependencies for redisinsight package.js
+      # if: ${{ contains(inputs.skip-electron-deps, '1') }}
+      uses: ./.github/actions/install-deps
+      with:
+        dir-path: './redisinsight'
+        keytar-host-mirror: ${{ inputs.keytar-host-mirror }}
+        sqlite3-host-mirror: ${{ inputs.sqlite3-host-mirror }}
+
+    - name: Install dependencies for BE package.js
+      # if: ${{ !contains(inputs.skip-backend-deps, '1') }}
+      uses: ./.github/actions/install-deps
+      with:
+        dir-path: './redisinsight/api'
+
+    - name: Install dependencies for root package.js
+      # if: ${{ contains(inputs.skip-electron-deps, '1') }}
+      uses: ./.github/actions/install-deps
+      with:
+        dir-path: './'
+        keytar-host-mirror: ${{ inputs.keytar-host-mirror }}
+        sqlite3-host-mirror: ${{ inputs.sqlite3-host-mirror }}

.github/actions/install-apple-certs/action.yml

@@ -0,0 +1,49 @@
+name: Add certs to the keychain (macos)
+
+inputs:
+  CSC_P12_BASE64:
+    required: true
+  CSC_MAC_INSTALLER_P12_BASE64:
+    required: true
+  CSC_MAS_P12_BASE64:
+    required: true
+  CSC_KEY_PASSWORD:
+    required: true
+  CSC_MAS_PASSWORD:
+    required: true
+  CSC_MAC_INSTALLER_PASSWORD:
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup sign certificates
+      shell: bash
+      env:
+        CSC_P12_BASE64: ${{ inputs.CSC_P12_BASE64 }}
+        CSC_MAC_INSTALLER_P12_BASE64: ${{ inputs.CSC_MAC_INSTALLER_P12_BASE64 }}
+        CSC_MAS_P12_BASE64: ${{ inputs.CSC_MAS_P12_BASE64 }}
+      run: |
+        mkdir -p certs
+        echo "$CSC_P12_BASE64" | base64 -d > certs/mac-developer.p12
+        echo "$CSC_MAC_INSTALLER_P12_BASE64" | base64 -d > certs/mac-installer.p12
+        echo "$CSC_MAS_P12_BASE64" | base64 -d > certs/mas-distribution.p12
+
+    - name: Add certs to the keychain
+      shell: bash
+      env:
+        KEYCHAIN: redisinsight.keychain
+        CSC_KEY_PASSWORD: ${{ inputs.CSC_KEY_PASSWORD }}
+        CSC_MAS_PASSWORD: ${{ inputs.CSC_MAS_PASSWORD }}
+        CSC_MAC_INSTALLER_PASSWORD: ${{ inputs.CSC_MAC_INSTALLER_PASSWORD }}
+      run: |
+        security create-keychain -p mysecretpassword $KEYCHAIN
+        security default-keychain -s $KEYCHAIN
+        security unlock-keychain -p mysecretpassword $KEYCHAIN
+        security set-keychain-settings -u -t 10000000 $KEYCHAIN
+        security import certs/mac-developer.p12 -k $KEYCHAIN -P "$CSC_KEY_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
+        security import certs/mas-distribution.p12 -k $KEYCHAIN -P "$CSC_MAS_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
+        security import certs/mac-installer.p12 -k $KEYCHAIN -P "$CSC_MAC_INSTALLER_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
+        security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
+        security list-keychain -d user -s $KEYCHAIN
+

.github/actions/install-deps/action.yml

@@ -0,0 +1,33 @@
+name: Install Dependencies action
+description: Caches and installs dependencies for a given path
+inputs:
+  dir-path:
+    description: Path to the directory
+    required: true
+  keytar-host-mirror:
+    description: Keytar binary host mirror
+    required: false
+  sqlite3-host-mirror:
+    description: SQLite3 binary host mirror
+    required: false
+  skip-postinstall:
+    description: Skip postinstall
+    required: false
+    default: '0'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Install dependencies
+      working-directory: ${{ inputs.dir-path }}
+      shell: bash
+
+      # env:
+      #   SKIP_POSTINSTALL: ${{ inputs.skip-postinstall }}
+      # run: yarn install
+      run: |
+        # todo: uncomment after build our binaries
+        # export npm_config_keytar_binary_host_mirror=${{ inputs.keytar-host-mirror }}
+        # export npm_config_node_sqlite3_binary_host_mirror=${{ inputs.sqlite3-host-mirror }}
+
+        yarn install

.github/actions/install-windows-certs/action.yml

@@ -0,0 +1,16 @@
+name: Install Windows certs
+
+inputs:
+  WIN_CSC_PFX_BASE64:
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup sign certificates
+      shell: bash
+      env:
+        WIN_CSC_PFX_BASE64: ${{ inputs.WIN_CSC_PFX_BASE64 }}
+      run: |
+        mkdir -p certs
+        echo "$WIN_CSC_PFX_BASE64" | base64 -d > certs/redislabs_win.pfx