Skip to content

Commit 8d624c5

Browse files
rsergeenkorsergeenko
committed
Merge branch 'main' into fe/feature/I-4181_to-tutorial-button
# Conflicts: # redisinsight/api/migration/index.ts
2 parents 4609b26 + 646a750 commit 8d624c5

File tree

62 files changed

+2151
-1483
lines changed

Some content is hidden

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

62 files changed

+2151
-1483
lines changed

‎.circleci/config.yml‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ aliases:
88
security create-keychain -p mysecretpassword $KEYCHAIN
99
security default-keychain -s $KEYCHAIN
1010
security unlock-keychain -p mysecretpassword $KEYCHAIN
11-
security import certs/cert.p12 -k $KEYCHAIN -P "$CSC_KEY_PASSWORD" -T /usr/bin/codesign
11+
security set-keychain-settings -u -t 10000000 $KEYCHAIN
12+
security import certs/mac-developer.p12 -k $KEYCHAIN -P "$CSC_KEY_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
13+
security import certs/mas-distribution.p12 -k $KEYCHAIN -P "$CSC_MAS_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
14+
security import certs/mac-installer.p12 -k $KEYCHAIN -P "$CSC_MAC_INSTALLER_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
1215
security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
1316
environment:
1417
KEYCHAIN: redisinsight.keychain
@@ -129,7 +132,7 @@ aliases:
129132
key: v1-ui-deps-{{ checksum "redisinsight/api/yarn.lock" }}
130133

131134
orbs:
132-
win: circleci/[email protected].0
135+
win: circleci/[email protected].1
133136
node: circleci/[email protected]
134137
aws: circleci/[email protected]
135138

@@ -447,7 +450,9 @@ jobs:
447450
name: Setup sign certificates
448451
command: |
449452
mkdir -p certs
450-
echo "$CSC_P12_BASE64" | base64 -id > certs/cert.p12
453+
echo "$CSC_P12_BASE64" | base64 -id > certs/mac-developer.p12
454+
echo "$CSC_MAC_INSTALLER_P12_BASE64" | base64 -id > certs/mac-installer.p12
455+
echo "$CSC_MAS_P12_BASE64" | base64 -id > certs/mas-distribution.p12
451456
echo "$WIN_CSC_PFX_BASE64" | base64 -id > certs/redislabs_win.pfx
452457
- persist_to_workspace:
453458
root: .
@@ -469,19 +474,11 @@ jobs:
469474
mkdir electron
470475
471476
CURRENT_VERSION=$(jq -r ".version" redisinsight/package.json)
472-
echo "Version: ${CURRENT_VERSION}"
473-
474-
if [ << parameters.env >> == "prod" ]; then
475-
echo "Build version: $CURRENT_VERSION"
476-
cp ./redisinsight/package.json ./electron/package.json
477-
echo "$VERSION" > electron/version
478-
exit 0
479-
fi
480-
481-
VERSION=$CURRENT_VERSION-<< parameters.env >>-$CIRCLE_BUILD_NUM
482-
echo "Build version: $VERSION"
477+
echo "Build version: $CURRENT_VERSION"
478+
cp ./redisinsight/package.json ./electron/package.json
483479
echo "$VERSION" > electron/version
484-
echo $(jq ".version=\"$VERSION\"" redisinsight/package.json) > electron/package.json
480+
exit 0
481+
485482
- persist_to_workspace:
486483
root: /root/project
487484
paths:
@@ -568,7 +565,7 @@ jobs:
568565
- release/redisstack
569566
macosx:
570567
macos:
571-
xcode: 13.2.1
568+
xcode: 14.2.0
572569
parameters:
573570
env:
574571
description: Build environment (stage || prod)
@@ -595,21 +592,26 @@ jobs:
595592
- run:
596593
name: Build macos dmg
597594
command: |
595+
unset CSC_LINK
596+
export CSC_IDENTITY_AUTO_DISCOVERY=true
597+
export CSC_KEYCHAIN=redisinsight.keychain
598+
598599
if [ << parameters.env >> == 'prod' ]; then
599600
yarn package:prod
601+
yarn package:mas
600602
rm -rf release/mac
601603
exit 0;
602604
fi
603605
604606
if [ << parameters.env >> == 'stage' ]; then
605-
UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage
607+
UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage && yarn package:mas
606608
rm -rf release/mac
607609
exit 0;
608610
fi
609611
610-
UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage
612+
UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage && yarn package:mas
611613
rm -rf release/mac
612-
no_output_timeout: 15m
614+
no_output_timeout: 60m
613615

614616
- run:
615617
name: Repack dmg to tar
@@ -622,6 +624,7 @@ jobs:
622624
- release/RedisInsight*.zip
623625
- release/RedisInsight*.dmg
624626
- release/RedisInsight*.dmg.blockmap
627+
- release/**/*.pkg
625628
- release/*-mac.yml
626629
- release/redisstack
627630
windows:

‎dev.provisionprofile‎

12.4 KB
Binary file not shown.

‎electron-builder-mas.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
const electronBuilder = require('./electron-builder.json');
2+
3+
const config = {
4+
...electronBuilder,
5+
appId: 'com.redis.RedisInsight',
6+
productName: 'RedisInsight',
7+
};
8+
9+
module.exports = config;

‎electron-builder.json‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,72 @@
1414
"afterSign": "electron-builder-notarize",
1515
"artifactName": "${productName}-${os}-${arch}.${ext}",
1616
"compression": "normal",
17+
"asarUnpack": [
18+
"node_modules/keytar",
19+
"node_modules/sqlite3",
20+
"node_modules/cpu-features"
21+
],
1722
"mac": {
1823
"target": [
1924
{
2025
"target": "dmg",
2126
"arch": ["x64", "arm64"]
22-
}, {
27+
},
28+
{
2329
"target": "zip",
2430
"arch": ["x64", "arm64"]
2531
}
2632
],
2733
"type": "distribution",
2834
"hardenedRuntime": true,
2935
"darkModeSupport": true,
36+
"bundleVersion": "3",
37+
"icon": "resources/icon.icns",
38+
"artifactName": "${productName}-${os}-${arch}.${ext}",
3039
"entitlements": "resources/entitlements.mac.plist",
3140
"entitlementsInherit": "resources/entitlements.mac.plist",
3241
"gatekeeperAssess": false
3342
},
43+
"mas": {
44+
"mergeASARs": false,
45+
"entitlements": "resources/entitlements.mas.plist",
46+
"entitlementsInherit": "resources/entitlements.mas.inherit.plist",
47+
"entitlementsLoginHelper": "resources/entitlements.mas.loginhelper.plist",
48+
"hardenedRuntime": false,
49+
"asarUnpack": ["node_modules"],
50+
"provisioningProfile": "embedded.provisionprofile",
51+
"binaries": [
52+
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
53+
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
54+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
55+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
56+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
57+
"Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
58+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node",
59+
"Contents/Resources/app-x64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node"
60+
],
61+
"artifactName": "${productName}-${os}-${arch}-mas.${ext}"
62+
},
63+
"masDev": {
64+
"mergeASARs": false,
65+
"entitlements": "resources/entitlements.mas.plist",
66+
"entitlementsInherit": "resources/entitlements.mas.inherit.plist",
67+
"entitlementsLoginHelper": "resources/entitlements.mas.loginhelper.plist",
68+
"hardenedRuntime": false,
69+
"asarUnpack": ["node_modules"],
70+
"provisioningProfile": "dev.provisionprofile",
71+
"binaries": [
72+
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
73+
"Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
74+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
75+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
76+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
77+
"Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
78+
"Contents/Resources/app-arm64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node",
79+
"Contents/Resources/app-x64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node"
80+
],
81+
"artifactName": "${productName}-${os}-${arch}-masDev.${ext}"
82+
},
3483
"dmg": {
3584
"contents": [
3685
{
@@ -48,6 +97,7 @@
4897
"win": {
4998
"target": ["nsis"],
5099
"artifactName": "${productName}-${os}-installer.${ext}",
100+
"icon": "resources/icon.ico",
51101
"publisherName": [
52102
"Redis Inc.",
53103
"Redis Labs Inc."

‎embedded.provisionprofile‎

11.9 KB
Binary file not shown.

‎package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
"package": "yarn package:dev",
2727
"package:prod": "yarn build:prod && electron-builder build -p never",
2828
"package:stage": "yarn build:stage && electron-builder build -p never",
29+
"package:mas": "electron-builder build -p never -m mas:universal -c ./electron-builder-mas.js",
30+
"package:mas:dev": "electron-builder build -p never -m mas-dev:universal -c ./electron-builder-mas.js",
2931
"package:dev": "yarn build && cross-env DEBUG=electron-builder electron-builder build -p never",
3032
"package:win": "yarn build:prod && electron-builder build --win --x64 -p never",
3133
"package:mac": "yarn build:prod && electron-builder build --mac -p never",
@@ -152,11 +154,11 @@
152154
"css-loader": "^5.0.1",
153155
"css-minimizer-webpack-plugin": "^1.2.0",
154156
"electron": "^19.0.7",
155-
"electron-builder": "^23.1.0",
156-
"electron-builder-notarize": "^1.5.0",
157+
"electron-builder": "^23.6.0",
158+
"electron-builder-notarize": "^1.5.1",
157159
"electron-debug": "^3.2.0",
158160
"electron-devtools-installer": "^3.2.0",
159-
"electron-rebuild": "^3.2.7",
161+
"electron-rebuild": "^3.2.9",
160162
"eslint": "^7.5.0",
161163
"eslint-config-airbnb": "^18.2.1",
162164
"eslint-config-airbnb-typescript": "^12.0.0",

‎redisinsight/about-panel.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ const ICON_PATH = app.isPackaged
77

88
export default {
99
applicationName: 'RedisInsight-v2',
10-
applicationVersion: app.getVersion() || '2.20.0',
10+
applicationVersion:
11+
`${app.getVersion() || '2.22.1'}${process.env.NODE_ENV !== 'production' ? `-dev-${process.getCreationTime()}` : ''}`,
1112
copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
1213
iconPath: ICON_PATH,
1314
};

‎redisinsight/api/config/default.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default {
5656
tlsKey: process.env.SERVER_TLS_KEY,
5757
staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
5858
buildType: process.env.BUILD_TYPE || 'ELECTRON',
59-
appVersion: process.env.APP_VERSION || '2.20.0',
59+
appVersion: process.env.APP_VERSION || '2.22.0',
6060
requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
6161
excludeRoutes: [],
6262
excludeAuthRoutes: [],

‎redisinsight/api/config/swagger.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
55
info: {
66
title: 'RedisInsight Backend API',
77
description: 'RedisInsight Backend API',
8-
version: '2.20.0',
8+
version: '2.22.1',
99
},
1010
tags: [],
1111
};

‎redisinsight/api/migration/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import { workbenchAndAnalysisDbIndex1673934231410 } from './1673934231410-workbe
2727
import { browserHistory1674539211397 } from './1674539211397-browser-history';
2828
import { databaseAnalysisRecommendations1674660306971 } from './1674660306971-database-analysis-recommendations';
2929
import { databaseTimeout1675398140189 } from './1675398140189-database-timeout';
30-
import { customTutorials1677135091633 } from './1677135091633-custom-tutorials';
3130
import { databaseCompressor1678182722874 } from './1678182722874-database-compressor';
31+
import { customTutorials1677135091633 } from './1677135091633-custom-tutorials';
3232

3333
export default [
3434
initialMigration1614164490968,
@@ -60,6 +60,6 @@ export default [
6060
databaseAnalysisRecommendations1674660306971,
6161
browserHistory1674539211397,
6262
databaseTimeout1675398140189,
63-
customTutorials1677135091633,
6463
databaseCompressor1678182722874,
64+
customTutorials1677135091633,
6565
];

0 commit comments

Comments
 (0)