Skip to content

Commit 74ed95c

Browse files
egor-zalenskiegor-zalenski
committed
#RI-6349 - Fix mas build
1 parent 1d95d8a commit 74ed95c

File tree

9 files changed

+40
-59
lines changed

9 files changed

+40
-59
lines changed

‎.github/workflows/pipeline-build-macos.yml‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,37 +64,35 @@ jobs:
6464
mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
6565
6666
- name: Build macos dmg (staging)
67-
if: (vars.ENV == 'staging' || vars.ENV == 'development') && inputs.target == vars.ALL
67+
# if: (vars.ENV == 'staging' || vars.ENV == 'development') && inputs.target == vars.ALL
6868
run: |
6969
unset CSC_LINK
7070
7171
echo $APP_BUNDLE_VERSION
7272
echo $CSC_KEYCHAIN
7373
74-
yarn package:stage
74+
yarn package:stage && yarn package:mas
7575
rm -rf release/mac
76-
77-
# TODO: return MAS build
78-
# yarn package:stage && yarn package:mas
79-
# mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
76+
77+
mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
8078
8179
# handle manual builds
82-
- name: Build macos dmg (custom)
83-
if: inputs.target != vars.ALL
84-
run: |
85-
unset CSC_LINK
86-
target=$(echo "${{inputs.target}}" | grep -oE 'build_macos_[^ ]+' | sed 's/build_macos_/dmg:/' | paste -sd ' ' -)
80+
# - name: Build macos dmg (custom)
81+
# if: inputs.target != vars.ALL
82+
# run: |
83+
# unset CSC_LINK
84+
# target=$(echo "${{inputs.target}}" | grep -oE 'build_macos_[^ ]+' | sed 's/build_macos_/dmg:/' | paste -sd ' ' -)
8785

88-
if [ "${{ vars.ENV == 'production' }}" == "true" ]; then
89-
yarn package:prod --mac $target
90-
else
91-
yarn package:stage --mac $target
92-
fi
86+
# if [ "${{ vars.ENV == 'production' }}" == "true" ]; then
87+
# yarn package:prod --mac $target
88+
# else
89+
# yarn package:stage --mac $target
90+
# fi
9391

94-
rm -rf release/mac
92+
# rm -rf release/mac
9593

9694
- name: Repack dmg to tar
97-
if: vars.ENV == 'production' && inputs.target == vars.ALL
95+
# if: vars.ENV == 'production' && inputs.target == vars.ALL
9896
run: |
9997
ARCH=x64 ./.github/redisstack/dmg.repack.sh
10098
ARCH=arm64 ./.github/redisstack/dmg.repack.sh

‎electron-builder-mas.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const electronBuilder = require('./electron-builder.json')
22

33
const config = {
44
...electronBuilder,
5+
npmRebuild: true,
56
appId: 'com.redis.RedisInsight',
67
}
78

‎electron-builder.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"compression": "normal",
1313
"asarUnpack": [
1414
"node_modules/keytar",
15-
"node_modules/sqlite3",
16-
"node_modules/cpu-features"
15+
"node_modules/sqlite3"
1716
],
1817
"protocols": [{
1918
"name": "RedisInsight",

‎redisinsight/api/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"@nestjs/platform-socket.io/socket.io": "^4.8.0",
4949
"@nestjs/cli/**/braces": "^3.0.3",
5050
"**/semver": "^7.5.2",
51+
"**/cpu-features": "file:./stubs/cpu-features",
5152
"winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
5253
},
5354
"dependencies": {

‎redisinsight/api/stubs/cpu-features/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = {};

‎redisinsight/api/stubs/cpu-features/package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"name": "cpu-features",
3+
"version": "1.0.0",
4+
"main": "index.js"
5+
}

‎redisinsight/api/yarn.lock‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2626,11 +2626,6 @@ buffer@^6.0.3:
26262626
base64-js "^1.3.1"
26272627
ieee754 "^1.2.1"
26282628

2629-
buildcheck@~0.0.6:
2630-
version "0.0.6"
2631-
resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
2632-
integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
2633-
26342629
busboy@^1.0.0, busboy@^1.6.0:
26352630
version "1.6.0"
26362631
resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
@@ -3213,13 +3208,8 @@ cosmiconfig@^8.2.0:
32133208
parse-json "^5.2.0"
32143209
path-type "^4.0.0"
32153210

3216-
cpu-features@~0.0.9:
3217-
version "0.0.9"
3218-
resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.9.tgz#5226b92f0f1c63122b0a3eb84cb8335a4de499fc"
3219-
integrity sha512-AKjgn2rP2yJyfbepsmLfiYcmtNn/2eUvocUyM/09yB0YDiz39HteK/5/T4Onf0pmdYDMgkBoGvRLvEguzyL7wQ==
3220-
dependencies:
3221-
buildcheck "~0.0.6"
3222-
nan "^2.17.0"
3211+
"cpu-features@file:./stubs/cpu-features", cpu-features@~0.0.9:
3212+
version "1.0.0"
32233213

32243214
create-jest@^29.7.0:
32253215
version "29.7.0"
@@ -6446,11 +6436,6 @@ mz@^2.4.0:
64466436
object-assign "^4.0.1"
64476437
thenify-all "^1.0.0"
64486438

6449-
nan@^2.17.0:
6450-
version "2.17.0"
6451-
resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
6452-
integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
6453-
64546439
nan@^2.18.0:
64556440
version "2.18.0"
64566441
resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"

‎redisinsight/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
},
1717
"resolutions": {
1818
"**/semver": "^7.5.2",
19-
"sqlite3/**/tar": "^6.2.1"
19+
"sqlite3/**/tar": "^6.2.1",
20+
"**/cpu-features": "file:./api/stubs/cpu-features"
2021
},
2122
"dependencies": {
2223
"keytar": "^7.9.0",

‎redisinsight/yarn.lock‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,6 @@ buffer@^5.5.0:
129129
base64-js "^1.3.1"
130130
ieee754 "^1.1.13"
131131

132-
buildcheck@~0.0.6:
133-
version "0.0.6"
134-
resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
135-
integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
136-
137132
cacache@^15.2.0:
138133
version "15.3.0"
139134
resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
@@ -188,13 +183,8 @@ console-control-strings@^1.1.0:
188183
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
189184
integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
190185

191-
cpu-features@~0.0.9:
192-
version "0.0.10"
193-
resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.10.tgz#9aae536db2710c7254d7ed67cb3cbc7d29ad79c5"
194-
integrity sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==
195-
dependencies:
196-
buildcheck "~0.0.6"
197-
nan "^2.19.0"
186+
"cpu-features@file:./api/stubs/cpu-features", cpu-features@~0.0.10:
187+
version "1.0.0"
198188

199189
debug@4, debug@^4.3.3:
200190
version "4.3.4"
@@ -557,10 +547,10 @@ ms@^2.0.0:
557547
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
558548
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
559549

560-
nan@^2.18.0, nan@^2.19.0:
561-
version "2.20.0"
562-
resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3"
563-
integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==
550+
nan@^2.20.0:
551+
version "2.22.0"
552+
resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3"
553+
integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
564554

565555
napi-build-utils@^1.0.1:
566556
version "1.0.2"
@@ -810,15 +800,15 @@ [email protected]:
810800
node-gyp "8.x"
811801

812802
ssh2@^1.15.0:
813-
version "1.15.0"
814-
resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.15.0.tgz#2f998455036a7f89e0df5847efb5421748d9871b"
815-
integrity sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw==
803+
version "1.16.0"
804+
resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.16.0.tgz#79221d40cbf4d03d07fe881149de0a9de928c9f0"
805+
integrity sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==
816806
dependencies:
817807
asn1 "^0.2.6"
818808
bcrypt-pbkdf "^1.0.2"
819809
optionalDependencies:
820-
cpu-features "~0.0.9"
821-
nan "^2.18.0"
810+
cpu-features "~0.0.10"
811+
nan "^2.20.0"
822812

823813
ssri@^8.0.0, ssri@^8.0.1:
824814
version "8.0.1"

0 commit comments

Comments
 (0)