Skip to content

Latest #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 23, 2021
Merged

Latest #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d3d625f
Merge pull request #13 from RedisInsight/main
Nov 18, 2021
4e45db8
Merge pull request #14 from RedisInsight/release/2.0.2-preview
Nov 18, 2021
8813376
Add "preview" to artifacte name
egor-zalenski Nov 22, 2021
cf81b89
cherry pick for e2e [fix the test]
tanyatrayanava Nov 19, 2021
9397c31
* #RI-2077 Autoupdate from CloudFront
egor-zalenski Nov 22, 2021
f45e32b
Merge pull request #24 from RedisInsight/cherry_pick_updates_release
egor-zalenski Nov 22, 2021
c921344
Merge pull request #25 from RedisInsight/release/2.0.2-preview
egor-zalenski Nov 22, 2021
fdc56c9
add env variables to electron build
egor-zalenski Nov 22, 2021
f213f0a
Merge pull request #27 from RedisInsight/cherry_pick_updates_release
egor-zalenski Nov 22, 2021
1b59c7c
Merge pull request #28 from RedisInsight/release/2.0.2-preview
egor-zalenski Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,26 +671,26 @@ jobs:
declare -A tag0=(
[key]='platform'
[value]='macos'
[objectDownload]=${appFileName}'-mac-x64.dmg'
[objectUpgrade]=${appFileName}'.zip'
[objectDownload]=${applicationName}'-mac-x64.dmg'
[objectUpgrade]=${applicationName}'.zip'
)

declare -A tag1=(
[key]='platform'
[value]='windows'
[objectDownload]=${appFileName}'-win-installer.exe'
[objectDownload]=${applicationName}'-win-installer.exe'
)

declare -A tag2=(
[key]='platform'
[value]='linux_AppImage'
[objectDownload]=${appFileName}'-linux.AppImage'
[objectDownload]=${applicationName}'-linux.AppImage'
)

declare -A tag3=(
[key]='platform'
[value]='linux_deb'
[objectDownload]=${appFileName}'-linux.deb'
[objectDownload]=${applicationName}'-linux.deb'
)

# loop for add all tags to each app and create metrics
Expand Down
2 changes: 2 additions & 0 deletions configs/webpack.config.main.prod.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ export default merge(baseConfig, {
SERVER_TLS: true,
SERVER_TLS_CERT: process.env.SERVER_TLS_CERT || '',
SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
UPGRADES_LINK: process.env.UPGRADES_LINK || '',
BUILD_TYPE: 'ELECTRON',
APP_VERSION: version,
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
Expand Down
2 changes: 2 additions & 0 deletions configs/webpack.config.main.stage.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export default merge(mainProdConfig, {
SERVER_TLS: true,
SERVER_TLS_CERT: process.env.SERVER_TLS_CERT || '',
SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
UPGRADES_LINK: process.env.UPGRADES_LINK || '',
BUILD_TYPE: 'ELECTRON',
APP_VERSION: version,
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
Expand Down
8 changes: 4 additions & 4 deletions electron-builder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"package.json"
],
"afterSign": "electron-builder-notarize",
"artifactName": "RedisInsight.${ext}",
"artifactName": "${productName}.${ext}",
"compression": "normal",
"mac": {
"target": ["dmg", "zip"],
Expand All @@ -24,7 +24,7 @@
"gatekeeperAssess": false
},
"dmg": {
"artifactName": "RedisInsight-${os}-x64.${ext}",
"artifactName": "${productName}-${os}-x64.${ext}",
"contents": [
{
"x": 130,
Expand All @@ -40,14 +40,14 @@
},
"win": {
"target": ["nsis"],
"artifactName": "RedisInsight-${os}-installer.${ext}"
"artifactName": "${productName}-${os}-installer.${ext}"
},
"linux": {
"icon": "./resources/icons",
"target": ["deb", "AppImage"],
"synopsis": "Redis GUI by Redis Ltd.",
"category": "Development",
"artifactName": "RedisInsight-${os}.${ext}",
"artifactName": "${productName}-${os}.${ext}",
"desktop": {
"Name": "RedisInsight",
"Type": "Application",
Expand Down
6 changes: 2 additions & 4 deletions redisinsight/main.dev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ export default class AppUpdater {
log.transports.file.level = 'info';

autoUpdater.setFeedURL({
provider: 's3',
path: 'public/upgrades/',
bucket: process.env.MANUAL_UPDATE_BUCKET || process.env.AWS_BUCKET_NAME,
region: 'us-east-1',
provider: 'generic',
url: process.env.MANUAL_UPGRADES_LINK || process.env.UPGRADES_LINK,
});

autoUpdater.checkForUpdatesAndNotify();
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ test('Verify that user can resize(maximize)/(minimize) the enablement area (the
const offsetX = 100;
const areaWidthBefore = await workbenchPage.preselectsAreaContainer.clientWidth;
//Minimize the area with default scripts
await t.drag(workbenchPage.resizeButtonForPreselectsArea, -offsetX, 0, { speed: 0.2 });
await t.drag(workbenchPage.resizeButtonForPreselectsArea, -offsetX, 0, { speed: 0.1 });
await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).lt(areaWidthBefore, 'Default scripts area is smaller after resize');
//Maximize the area with default scripts
const areaWidthAfter = await workbenchPage.preselectsAreaContainer.clientWidth;
await t.click(workbenchPage.preselectsAreaContainer);
await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.2 });
await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gt(areaWidthAfter, 'Default scripts area is bigger after resize');
await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.1 });
await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gte(areaWidthAfter, 'Default scripts area is bigger after resize');
});
test('Verify that user can expand/collapse the enablement area', async t => {
//Collapse the area with default scripts
Expand Down