Skip to content

Commit 10169fd

Browse files
vlad-dargelvlad-dargel
authored
Merge pull request #4032 from RedisInsight/release/2.60.0
Release/2.60.0 to latest
2 parents eeb5170 + 2914484 commit 10169fd

File tree

443 files changed

+21329
-10559
lines changed

Some content is hidden

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

443 files changed

+21329
-10559
lines changed

‎.circleci/build/build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ yarn
66
yarn --cwd redisinsight/api
77

88
# build
9+
910
yarn build:statics
1011
yarn build:ui
1112
yarn --cwd ./redisinsight/api build:prod

‎.circleci/build/release-docker.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
HELP="Args:
5-
-v - Semver (2.58.0)
5+
-v - Semver (2.60.0)
66
-d - Build image repository (Ex: -d redisinsight)
77
-r - Target repository (Ex: -r redis/redisinsight)
88
"

‎.circleci/config.yml‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ aliases:
121121
- oss-st-5 # OSS Standalone v5
122122
- oss-st-5-pass # OSS Standalone v5 with admin pass required
123123
- oss-st-6 # OSS Standalone v6 and all modules
124-
- oss-st-big # OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M)
124+
# TODO: Investigate why it randomly fails
125+
# - oss-st-big # OSS Standalone v6 and all modules and predefined amount of data inside (~3-4M)
125126
- mods-preview # OSS Standalone and all preview modules
126127
- oss-st-6-tls # OSS Standalone v6 with TLS enabled
127128
- oss-st-6-tls-auth # OSS Standalone v6 with TLS auth required
@@ -213,6 +214,9 @@ parameters:
213214
redis_client:
214215
type: string
215216
default: ""
217+
env:
218+
type: string
219+
default: "stage"
216220

217221
jobs:
218222
# Test jobs
@@ -1351,24 +1355,24 @@ workflows:
13511355
os: linux
13521356
target: << pipeline.parameters.linux >>
13531357
- setup-sign-certificates:
1354-
name: Setup sign certificates (stage)
1358+
name: Setup sign certificates (<< pipeline.parameters.env >>)
13551359
requires:
13561360
- Validating build parameters
13571361
- setup-build:
1358-
name: Setup build (stage)
1359-
env: stage
1362+
name: Setup build (<< pipeline.parameters.env >>)
1363+
env: << pipeline.parameters.env >>
13601364
requires:
1361-
- Setup sign certificates (stage)
1365+
- Setup sign certificates (<< pipeline.parameters.env >>)
13621366
- linux:
1363-
name: Build app - Linux (stage)
1364-
env: stage
1367+
name: Build app - Linux (<< pipeline.parameters.env >>)
1368+
env: << pipeline.parameters.env >>
13651369
target: << pipeline.parameters.linux >>
13661370
requires:
1367-
- Setup build (stage)
1371+
- Setup build (<< pipeline.parameters.env >>)
13681372
- store-build-artifacts:
1369-
name: Store build artifacts (stage)
1373+
name: Store build artifacts (<< pipeline.parameters.env >>)
13701374
requires:
1371-
- Build app - Linux (stage)
1375+
- Build app - Linux (<< pipeline.parameters.env >>)
13721376
manual-build-mac:
13731377
when: << pipeline.parameters.mac >>
13741378
jobs:
@@ -1377,25 +1381,25 @@ workflows:
13771381
os: mac
13781382
target: << pipeline.parameters.mac >>
13791383
- setup-sign-certificates:
1380-
name: Setup sign certificates (stage)
1384+
name: Setup sign certificates (<< pipeline.parameters.env >>)
13811385
requires:
13821386
- Validating build parameters
13831387
- setup-build:
1384-
name: Setup build (stage)
1385-
env: stage
1388+
name: Setup build (<< pipeline.parameters.env >>)
1389+
env: << pipeline.parameters.env >>
13861390
requires:
1387-
- Setup sign certificates (stage)
1391+
- Setup sign certificates (<< pipeline.parameters.env >>)
13881392
- macosx:
1389-
name: Build app - MacOS (stage)
1390-
env: stage
1393+
name: Build app - MacOS (<< pipeline.parameters.env >>)
1394+
env: << pipeline.parameters.env >>
13911395
redisstack: false
13921396
target: << pipeline.parameters.mac >>
13931397
requires:
1394-
- Setup build (stage)
1398+
- Setup build (<< pipeline.parameters.env >>)
13951399
- store-build-artifacts:
1396-
name: Store build artifacts (stage)
1400+
name: Store build artifacts (<< pipeline.parameters.env >>)
13971401
requires:
1398-
- Build app - MacOS (stage)
1402+
- Build app - MacOS (<< pipeline.parameters.env >>)
13991403
manual-build-windows:
14001404
when: << pipeline.parameters.windows >>
14011405
jobs:
@@ -1404,24 +1408,24 @@ workflows:
14041408
os: windows
14051409
target: << pipeline.parameters.windows >>
14061410
- setup-sign-certificates:
1407-
name: Setup sign certificates (stage)
1411+
name: Setup sign certificates (<< pipeline.parameters.env >>)
14081412
requires:
14091413
- Validating build parameters
14101414
- setup-build:
1411-
name: Setup build (stage)
1412-
env: stage
1415+
name: Setup build (<< pipeline.parameters.env >>)
1416+
env: << pipeline.parameters.env >>
14131417
requires:
1414-
- Setup sign certificates (stage)
1418+
- Setup sign certificates (<< pipeline.parameters.env >>)
14151419
- windows:
1416-
name: Build app - Windows (stage)
1417-
env: stage
1420+
name: Build app - Windows (<< pipeline.parameters.env >>)
1421+
env: << pipeline.parameters.env >>
14181422
target: << pipeline.parameters.windows >>
14191423
requires:
1420-
- Setup build (stage)
1424+
- Setup build (<< pipeline.parameters.env >>)
14211425
- store-build-artifacts:
1422-
name: Store build artifacts (stage)
1426+
name: Store build artifacts (<< pipeline.parameters.env >>)
14231427
requires:
1424-
- Build app - Windows (stage)
1428+
- Build app - Windows (<< pipeline.parameters.env >>)
14251429
manual-build-docker:
14261430
when: << pipeline.parameters.docker >>
14271431
jobs:
@@ -1430,22 +1434,22 @@ workflows:
14301434
os: docker
14311435
target: << pipeline.parameters.docker >>
14321436
- setup-sign-certificates:
1433-
name: Setup sign certificates (stage)
1437+
name: Setup sign certificates (<< pipeline.parameters.env >>)
14341438
requires:
14351439
- Validating build parameters
14361440
- setup-build:
1437-
name: Setup build (stage)
1438-
env: stage
1441+
name: Setup build (<< pipeline.parameters.env >>)
1442+
env: << pipeline.parameters.env >>
14391443
requires:
1440-
- Setup sign certificates (stage)
1444+
- Setup sign certificates (<< pipeline.parameters.env >>)
14411445
- docker:
1442-
name: Build docker images (stage)
1446+
name: Build docker images (<< pipeline.parameters.env >>)
14431447
requires:
1444-
- Setup build (stage)
1448+
- Setup build (<< pipeline.parameters.env >>)
14451449
- store-build-artifacts:
1446-
name: Store build artifacts (stage)
1450+
name: Store build artifacts (<< pipeline.parameters.env >>)
14471451
requires:
1448-
- Build docker images (stage)
1452+
- Build docker images (<< pipeline.parameters.env >>)
14491453

14501454
# build electron app (dev) from "build" branches
14511455
build:

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

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: Install all libraries action
2+
description: Install all libraries and dependencies
3+
inputs:
4+
skip-electron-deps:
5+
description: Skip install electron dependencies
6+
default: '0'
7+
required: false
8+
9+
skip-backend-deps:
10+
description: Skip install backend dependencies
11+
default: '0'
12+
required: false
13+
14+
skip-postinstall:
15+
description: Skip postinstall
16+
default: '0'
17+
required: false
18+
19+
keytar-host-mirror:
20+
description: Keytar binary host mirror
21+
required: false
22+
23+
sqlite3-host-mirror:
24+
description: SQLite3 binary host mirror
25+
required: false
26+
27+
#TODO: check !contains
28+
29+
runs:
30+
using: 'composite'
31+
steps:
32+
# OS libraries
33+
- name: Setup Node
34+
uses: actions/[email protected]
35+
with:
36+
node-version: '20.15'
37+
# disable cache for windows
38+
# https://github.com/actions/setup-node/issues/975
39+
cache: ${{ runner.os != 'Windows' && 'yarn' || '' }}
40+
cache-dependency-path: ${{ runner.os != 'Windows' && '**/yarn.lock' || '' }}
41+
42+
- name: Setup Python
43+
# if: ${{ contains(inputs.skip-electron-deps, '1') }}
44+
uses: actions/setup-python@v5
45+
with:
46+
python-version: '3.11'
47+
48+
- name: Install linux libraries
49+
if: ${{ runner.os == 'Linux' }}
50+
# if: ${{ runner.os == 'Linux' && !contains(inputs.skip-electron-deps, '1') }}
51+
shell: bash
52+
run: |
53+
sudo apt-get update -qy
54+
sudo apt-get install -qy libsecret-1-dev rpm
55+
56+
- name: Install macos libraries
57+
if: ${{ runner.os == 'macOS' }}
58+
# if: ${{ runner.os == 'macOS' && !contains(inputs.skip-electron-deps, '1') }}
59+
shell: bash
60+
run: |
61+
brew install libsecret
62+
63+
# TODO: matrix?
64+
# Javascript dependencies
65+
- name: Install dependencies for redisinsight package.js
66+
# if: ${{ contains(inputs.skip-electron-deps, '1') }}
67+
uses: ./.github/actions/install-deps
68+
with:
69+
dir-path: './redisinsight'
70+
keytar-host-mirror: ${{ inputs.keytar-host-mirror }}
71+
sqlite3-host-mirror: ${{ inputs.sqlite3-host-mirror }}
72+
73+
- name: Install dependencies for BE package.js
74+
# if: ${{ !contains(inputs.skip-backend-deps, '1') }}
75+
uses: ./.github/actions/install-deps
76+
with:
77+
dir-path: './redisinsight/api'
78+
79+
- name: Install dependencies for root package.js
80+
# if: ${{ contains(inputs.skip-electron-deps, '1') }}
81+
uses: ./.github/actions/install-deps
82+
with:
83+
dir-path: './'
84+
keytar-host-mirror: ${{ inputs.keytar-host-mirror }}
85+
sqlite3-host-mirror: ${{ inputs.sqlite3-host-mirror }}

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Add certs to the keychain (macos)
2+
3+
inputs:
4+
CSC_P12_BASE64:
5+
required: true
6+
CSC_MAC_INSTALLER_P12_BASE64:
7+
required: true
8+
CSC_MAS_P12_BASE64:
9+
required: true
10+
CSC_KEY_PASSWORD:
11+
required: true
12+
CSC_MAS_PASSWORD:
13+
required: true
14+
CSC_MAC_INSTALLER_PASSWORD:
15+
required: true
16+
17+
runs:
18+
using: 'composite'
19+
steps:
20+
- name: Setup sign certificates
21+
shell: bash
22+
env:
23+
CSC_P12_BASE64: ${{ inputs.CSC_P12_BASE64 }}
24+
CSC_MAC_INSTALLER_P12_BASE64: ${{ inputs.CSC_MAC_INSTALLER_P12_BASE64 }}
25+
CSC_MAS_P12_BASE64: ${{ inputs.CSC_MAS_P12_BASE64 }}
26+
run: |
27+
mkdir -p certs
28+
echo "$CSC_P12_BASE64" | base64 -d > certs/mac-developer.p12
29+
echo "$CSC_MAC_INSTALLER_P12_BASE64" | base64 -d > certs/mac-installer.p12
30+
echo "$CSC_MAS_P12_BASE64" | base64 -d > certs/mas-distribution.p12
31+
32+
- name: Add certs to the keychain
33+
shell: bash
34+
env:
35+
KEYCHAIN: redisinsight.keychain
36+
CSC_KEY_PASSWORD: ${{ inputs.CSC_KEY_PASSWORD }}
37+
CSC_MAS_PASSWORD: ${{ inputs.CSC_MAS_PASSWORD }}
38+
CSC_MAC_INSTALLER_PASSWORD: ${{ inputs.CSC_MAC_INSTALLER_PASSWORD }}
39+
run: |
40+
security create-keychain -p mysecretpassword $KEYCHAIN
41+
security default-keychain -s $KEYCHAIN
42+
security unlock-keychain -p mysecretpassword $KEYCHAIN
43+
security set-keychain-settings -u -t 10000000 $KEYCHAIN
44+
security import certs/mac-developer.p12 -k $KEYCHAIN -P "$CSC_KEY_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
45+
security import certs/mas-distribution.p12 -k $KEYCHAIN -P "$CSC_MAS_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
46+
security import certs/mac-installer.p12 -k $KEYCHAIN -P "$CSC_MAC_INSTALLER_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
47+
security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
48+
security list-keychain -d user -s $KEYCHAIN
49+

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Install Dependencies action
2+
description: Caches and installs dependencies for a given path
3+
inputs:
4+
dir-path:
5+
description: Path to the directory
6+
required: true
7+
keytar-host-mirror:
8+
description: Keytar binary host mirror
9+
required: false
10+
sqlite3-host-mirror:
11+
description: SQLite3 binary host mirror
12+
required: false
13+
skip-postinstall:
14+
description: Skip postinstall
15+
required: false
16+
default: '0'
17+
18+
runs:
19+
using: 'composite'
20+
steps:
21+
- name: Install dependencies
22+
working-directory: ${{ inputs.dir-path }}
23+
shell: bash
24+
25+
# env:
26+
# SKIP_POSTINSTALL: ${{ inputs.skip-postinstall }}
27+
# run: yarn install
28+
run: |
29+
# todo: uncomment after build our binaries
30+
# export npm_config_keytar_binary_host_mirror=${{ inputs.keytar-host-mirror }}
31+
# export npm_config_node_sqlite3_binary_host_mirror=${{ inputs.sqlite3-host-mirror }}
32+
33+
yarn install

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Install Windows certs
2+
3+
inputs:
4+
WIN_CSC_PFX_BASE64:
5+
required: true
6+
7+
runs:
8+
using: 'composite'
9+
steps:
10+
- name: Setup sign certificates
11+
shell: bash
12+
env:
13+
WIN_CSC_PFX_BASE64: ${{ inputs.WIN_CSC_PFX_BASE64 }}
14+
run: |
15+
mkdir -p certs
16+
echo "$WIN_CSC_PFX_BASE64" | base64 -d > certs/redislabs_win.pfx

0 commit comments

Comments
 (0)