Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 30 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ jobs:
- run:
name: install dependencies
command: |
sudo apt-get update -y && sudo apt-get install -y rpm
yarn --cwd redisinsight/api/ install
yarn install
yarn build:statics
Expand Down Expand Up @@ -492,6 +493,7 @@ jobs:
paths:
- release/RedisInsight*.deb
- release/RedisInsight*.AppImage
- release/RedisInsight*.rpm
- release/*-linux.yml
- release/redisstack
macosx:
Expand Down Expand Up @@ -663,6 +665,19 @@ jobs:
echo "APP VERSION $applicationVersion"
ghr -t ${GH_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -prerelease -delete ${applicationVersion}

release-aws-test:
executor: linux-executor
steps:
- checkout
- attach_workspace:
at: .
- run:
name: publish
command: |
rm release/._* ||:
applicationVersion=$(jq -r '.version' redisinsight/package.json)
aws s3 cp release/ s3://${AWS_BUCKET_NAME_TEST}/public/rs-ri-builds/${CIRCLE_BUILD_NUM} --recursive --exclude "*.json"

release-aws-private:
executor: linux-executor
steps:
Expand Down Expand Up @@ -879,6 +894,13 @@ workflows:
- Build app - MacOS (dev)
- Build app - Windows (dev)

- release-aws-test:
name: Release AWS test
requires:
- Build app - Linux (dev)
- Build app - MacOS (dev)
- Build app - Windows (dev)

# build and release electron app (stage)
- setup-sign-certificates:
name: Setup sign certificates (stage)
Expand All @@ -905,6 +927,14 @@ workflows:
name: Build app - Windows (stage)
requires: *stageElectronBuildRequires
<<: *stageFilter

- release-aws-test:
name: Release AWS test
requires:
- Build app - Linux (stage)
- Build app - MacOS (stage)
- Build app - Windows (stage)

# Needs approval from QA team that build was tested before merging to latest
- qa-approve:
name: Approved by QA team
Expand Down
21 changes: 17 additions & 4 deletions electron-builder.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"productName": "RedisInsight-preview",
"productName": "RedisInsight-V2",
"appId": "org.RedisLabs.RedisInsight-V2",
"copyright": "Copyright © 2021 Redis Ltd.",
"files": [
Expand All @@ -12,7 +12,7 @@
"package.json"
],
"afterSign": "electron-builder-notarize",
"artifactName": "${productName}.${ext}",
"artifactName": "${productName}-${os}-${arch}.${ext}",
"compression": "normal",
"mac": {
"artifactName": "${productName}-${os}-${arch}.${ext}",
Expand Down Expand Up @@ -53,10 +53,23 @@
},
"linux": {
"icon": "./resources/icons",
"target": ["deb", "AppImage"],
"target": [
{
"target": "AppImage",
"arch": ["x64"]
},
{
"target": "deb",
"arch": ["x64"]
},
{
"target": "rpm",
"arch": ["x64"]
}
],
"synopsis": "Redis GUI by Redis Ltd.",
"category": "Development",
"artifactName": "${productName}-${os}.${ext}",
"artifactName": "${productName}-${os}-${arch}.${ext}",
"desktop": {
"Name": "RedisInsight",
"Type": "Application",
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/about-panel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const ICON_PATH = app.isPackaged
: path.join(__dirname, '../resources', 'icon.png');

export default {
applicationName: 'RedisInsight-preview',
applicationName: 'RedisInsight',
applicationVersion: app.getVersion() || '2.0',
copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
iconPath: ICON_PATH,
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/main.dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const bootstrap = async () => {
}

app.setName('RedisInsight');
app.setAppUserModelId('RedisInsight-preview');
app.setAppUserModelId('RedisInsight');
if (process.platform !== 'darwin') {
app.setAboutPanelOptions(AboutPanelOptions);
}
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "redisinsight",
"productName": "RedisInsight",
"private": true,
"version": "2.0.4-preview",
"version": "2.0.5",
"description": "RedisInsight",
"main": "./main.prod.js",
"author": {
Expand Down
Binary file modified resources/icon-tray-colored.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icon-tray-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icon.icns
Binary file not shown.
Binary file modified resources/icon.ico
Binary file not shown.
Binary file modified resources/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/icon_default.icns
Binary file not shown.
Binary file removed resources/icon_default.ico
Binary file not shown.
Binary file removed resources/icon_default.png
Binary file not shown.
Binary file modified resources/icons/128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/24x24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/icons/512x215.png
Binary file not shown.
File renamed without changes
Binary file modified resources/icons/64x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/icons_default/128x128.png
Binary file not shown.
Binary file removed resources/icons_default/16x16.png
Binary file not shown.
Binary file removed resources/icons_default/24x24.png
Binary file not shown.
Binary file removed resources/icons_default/256x256.png
Binary file not shown.
Binary file removed resources/icons_default/32x32.png
Binary file not shown.
Binary file removed resources/icons_default/48x48.png
Binary file not shown.
Binary file removed resources/icons_default/64x64.png
Binary file not shown.
Binary file removed resources/icons_default/96x96.png
Binary file not shown.