Skip to content
This repository has been archived by the owner on Jan 19, 2023. It is now read-only.

update electron for osx arm 64 #1822

Merged
merged 2 commits into from
Jan 13, 2021
Merged

update electron for osx arm 64 #1822

merged 2 commits into from
Jan 13, 2021

Conversation

akhenakh
Copy link
Contributor

What this PR does / why we need it:
Because of electon, octant does not build on OSX arm64 (m1)

Which issue(s) this PR fixes

Special notes for your reviewer:

Release note:

release-note update electron for osx arm 64

@wwitzel3 wwitzel3 added bug Something isn't working dependencies Pull requests that update a dependency file labels Jan 12, 2021
@GuessWhoSamFoo
Copy link
Contributor

https://www.electronjs.org/blog/electron-11-0 - that looks right. There's no way to test this via github actions, but we should bump to electron 11 regardless. package-lock.json needs to be updated as well

@akhenakh
update electron for osx arm 64
0f2e7e1 
Signed-off-by: Fabrice Aneche <akh@inair.space>
@GuessWhoSamFoo
Copy link
Contributor

can you rebase this?

@akhenakh
Copy link
Contributor Author

Since rebase:

$ rm -f package-lock.json && npm install --package-lock-only                                                                                                                                                                            
npm WARN old lockfile 
npm WARN old lockfile The package-lock.json file was created with an old version of npm,
npm WARN old lockfile so supplemental metadata must be fetched from the registry.
npm WARN old lockfile 
npm WARN old lockfile This is a one-time fix-up, please be patient...
npm WARN old lockfile 
npm ERR! code ERESOLVE
npm ERR! ERESOLVE unable to resolve dependency tree
npm ERR! 
npm ERR! While resolving: dash-frontend@0.0.0
npm ERR! Found: zone.js@0.11.3
npm ERR! node_modules/zone.js
npm ERR!   zone.js@"^0.11.1" from the root project
npm ERR! 
npm ERR! Could not resolve dependency:
npm ERR! peer zone.js@"~0.10.3" from @angular/core@11.0.8
npm ERR! node_modules/@angular/core
npm ERR!   @angular/core@"^11.0.7" from the root project
npm ERR!   peer @angular/core@"11.0.8" from @angular/animations@11.0.8
npm ERR!   node_modules/@angular/animations
npm ERR!     @angular/animations@"^11.0.7" from the root project

@GuessWhoSamFoo
Copy link
Contributor

GuessWhoSamFoo commented Jan 12, 2021 •
edited
Loading

Not sure what's happening there. My diffs off a8a1bdd look like below and don't have any dep conflicts

diff --git a/web/package-lock.json b/web/package-lock.json
index 778d0eca..13e72889 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -11335,9 +11335,9 @@
       }
     },
     "electron": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-10.2.0.tgz",
-      "integrity": "sha512-GBUyq8dwUqXPkCTkoID+eZ5Pm9GFlLUd2eSoGe8UOaHeW68SgCf5t75/uGHraQ1OIz/0qniyH5M4ebWEHGppyQ==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-11.1.1.tgz",
+      "integrity": "sha512-tlbex3xosJgfileN6BAQRotevPRXB/wQIq48QeQ08tUJJrXwE72c8smsM/hbHx5eDgnbfJ2G3a60PmRjHU2NhA==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -11346,9 +11346,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.19.11",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.11.tgz",
-          "integrity": "sha512-bwVfNTFZOrGXyiQ6t4B9sZerMSShWNsGRw8tC5DY1qImUNczS9SjT4G6PnzjCnxsu5Ubj6xjL2lgwddkxtQl5w==",
+          "version": "12.19.13",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.13.tgz",
+          "integrity": "sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w==",
           "dev": true
         }
       }
diff --git a/web/package.json b/web/package.json
index 7b4ea1b5..a90ff28f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -102,7 +102,7 @@
     "babel-loader": "^8.1.0",
     "codelyzer": "^6.0.1",
     "dayjs": "^1.9.1",
-    "electron": "^10.1.3",
+    "electron": "^11.1.1",
     "electron-builder": "^22.8.1",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~6.0.0",
(END)

@akhenakh
updated lock
8e7645b 
Signed-off-by: Fabrice Aneche <akh@inair.space>
@akhenakh
Copy link
Contributor Author

Should be okay now

GuessWhoSamFoo
GuessWhoSamFoo approved these changes Jan 13, 2021
View reviewed changes
Copy link
Contributor

@GuessWhoSamFoo GuessWhoSamFoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the help!

@GuessWhoSamFoo GuessWhoSamFoo merged commit be43084 into vmware-archive:master Jan 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@GuessWhoSamFoo GuessWhoSamFoo GuessWhoSamFoo approved these changes

@wwitzel3 wwitzel3 Awaiting requested review from wwitzel3

Assignees
No one assigned
Labels
bug Something isn't working dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Possible problem with new Apple M1 processors
3 participants
@akhenakh @GuessWhoSamFoo @wwitzel3