Skip to content

Commit 07a5ebe

Browse files
authored
Qfix: do not cache desktop packaging results (#9708)
* Qfix: do not cache desktop packaging results Signed-off-by: Alexey Zinoviev <[email protected]> * Move bump version to CI Signed-off-by: Alexey Zinoviev <[email protected]>
1 parent 0161035 commit 07a5ebe

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,9 +742,10 @@ jobs:
742742
run: node common/scripts/install-run-rush.js model-version
743743
- name: Package
744744
run: node common/scripts/install-run-rush.js package --to desktop -v
745-
- name: Package JSON
745+
- name: Bump package JSON version
746746
run: |
747747
cd desktop-package
748+
node ../common/scripts/install-run-rushx.js bump
748749
cat ./package.json
749750
- name: Install the Apple certificate and provisioning profile
750751
env:
@@ -847,9 +848,10 @@ jobs:
847848
run: node common/scripts/install-run-rush.js model-version
848849
- name: Package
849850
run: node common/scripts/install-run-rush.js package --to qms-desktop -v
850-
- name: Package JSON
851+
- name: Bump package JSON version
851852
run: |
852853
cd qms-desktop-package
854+
node ../common/scripts/install-run-rushx.js bump
853855
cat ./package.json
854856
- name: Install the Apple certificate and provisioning profile
855857
env:

desktop-package/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"template": "@hcengineering/default-package",
77
"scripts": {
88
"_phase:package": "rushx package",
9-
"package": "rushx bump && rm -rf ./dist && cp -r ../desktop/dist . && cp ../desktop/.env ./dist && echo 'done'",
9+
"package": "rm -rf ./dist && cp -r ../desktop/dist . && cp ../desktop/.env ./dist && echo 'done'",
1010
"dist": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -p onTag",
1111
"dist-local": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build",
1212
"dist-signed": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=true NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -c.afterSign=scripts/notarize.js -p onTag",

qms-desktop-package/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"template": "@hcengineering/default-package",
77
"scripts": {
88
"_phase:package": "rushx package",
9-
"package": "rushx bump && rm -rf ./dist && cp -r ../desktop/dist . && cp ../desktop/.env ./dist && cp src/AppIcon.png ./dist/ui/public && cp src/AppIcon.ico ./dist/ui/public && echo 'done'",
9+
"package": "rm -rf ./dist && cp -r ../desktop/dist . && cp ../desktop/.env ./dist && cp src/AppIcon.png ./dist/ui/public && cp src/AppIcon.ico ./dist/ui/public && echo 'done'",
1010
"dist": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -p onTag",
1111
"dist-local": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=false NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build",
1212
"dist-signed": "cross-env CSC_IDENTITY_AUTO_DISCOVERY=true NODE_ENV=production VERSION=$(node ../common/scripts/show_tag.js) MODEL_VERSION=$(node ../common/scripts/show_version.js) electron-builder build -c.afterSign=scripts/notarize.js -p onTag",

0 commit comments

Comments
 (0)