Skip to content
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.

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

nix: use jsbundle derivation for iOS as well #15924

Merged
merged 1 commit into from
May 22, 2023
Merged

Conversation

jakubgs
Copy link
Member

@jakubgs jakubgs commented May 16, 2023

For some unknown to me reason we are using a different Yarn call to Shadow-cljs to generate the JSBundle for iOS builds, while the one created by the Android derivation shoudl be exactly the same. I'm changing the target to just be make jsbundle while keeping aliases referencing old naming, and moving things around in nix folder to reflect the fact that the derivation is no longer Android-specific.

Also, crucially, I've changed the import in index.js to use the ./result/index.js path, since that's what Nix creates. I'm not sure if this clashes with any developer workflow that takes place locally, so I'd appreciate some testing from developers.

Depends on:

@jakubgs jakubgs self-assigned this May 16, 2023
@status-im-auto
Copy link
Member

status-im-auto commented May 16, 2023

Jenkins Builds

Click to see older builds (26)
Commit #️⃣ Finished (UTC) Duration Platform Result
60fe92d #1 2023-05-16 17:53:45 ~27 sec ios 📄log
60fe92d #1 2023-05-16 17:55:39 ~2 min android 📄log
dd0ba37 #2 2023-05-16 17:58:03 ~2 min android-e2e 📄log
dd0ba37 #2 2023-05-16 17:58:07 ~2 min android 📄log
dd0ba37 #2 2023-05-16 17:59:52 ~4 min ios 📄log
✔️ dd0ba37 #2 2023-05-16 18:01:49 ~6 min tests 📄log
1fad1b5 #3 2023-05-16 19:36:13 ~2 min android 📄log
1fad1b5 #3 2023-05-16 19:36:13 ~2 min android-e2e 📄log
1fad1b5 #3 2023-05-16 19:39:45 ~5 min ios 📄log
✔️ 1fad1b5 #3 2023-05-16 19:40:10 ~6 min tests 📄log
✔️ eed8a14 #4 2023-05-16 20:49:37 ~5 min android 🤖apk 📲
✔️ eed8a14 #4 2023-05-16 20:50:18 ~6 min tests 📄log
✔️ eed8a14 #4 2023-05-16 20:51:43 ~7 min ios 📱ipa 📲
✔️ eed8a14 #4 2023-05-16 20:53:03 ~9 min android-e2e 🤖apk 📲
✔️ ee82820 #5 2023-05-17 15:34:25 ~5 min tests 📄log
✔️ ee82820 #5 2023-05-17 15:34:34 ~6 min android-e2e 🤖apk 📲
✔️ ee82820 #5 2023-05-17 15:34:50 ~6 min android 🤖apk 📲
✔️ ee82820 #5 2023-05-17 15:35:06 ~6 min ios 📱ipa 📲
✔️ 41d3f55 #6 2023-05-17 17:14:31 ~6 min android-e2e 🤖apk 📲
✔️ 41d3f55 #6 2023-05-17 17:14:47 ~6 min android 🤖apk 📲
✔️ 41d3f55 #6 2023-05-17 17:15:04 ~6 min tests 📄log
✔️ 41d3f55 #6 2023-05-17 17:15:40 ~7 min ios 📱ipa 📲
✔️ d99c614 #7 2023-05-17 17:53:43 ~6 min android-e2e 🤖apk 📲
✔️ d99c614 #7 2023-05-17 17:53:51 ~6 min android 🤖apk 📲
✔️ d99c614 #7 2023-05-17 17:54:31 ~6 min ios 📱ipa 📲
✔️ d99c614 #7 2023-05-17 17:54:47 ~7 min tests 📄log
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ bda302a #8 2023-05-18 19:32:10 ~5 min tests 📄log
✔️ bda302a #8 2023-05-18 19:32:38 ~6 min android 🤖apk 📲
✔️ bda302a #8 2023-05-18 19:32:39 ~6 min android-e2e 🤖apk 📲
✔️ bda302a #8 2023-05-18 19:33:00 ~6 min ios 📱ipa 📲
bda302a #9 2023-05-18 19:46:21 ~1 min ios 📄log
bda302a #10 2023-05-18 19:54:28 ~12 sec ios 📄log
bda302a #11 2023-05-18 19:57:01 ~1 min ios 📄log
bda302a #12 2023-05-18 20:07:31 ~1 min ios 📄log
✔️ 58d2096 #9 2023-05-22 08:36:56 ~5 min android-e2e 🤖apk 📲
✔️ 58d2096 #9 2023-05-22 08:37:33 ~5 min tests 📄log
✔️ 58d2096 #9 2023-05-22 08:37:40 ~5 min android 🤖apk 📲
✔️ 58d2096 #13 2023-05-22 08:39:49 ~8 min ios 📱ipa 📲

@jakubgs jakubgs force-pushed the ios/nix-built-jsbundle branch 4 times, most recently from eed8a14 to ee82820 Compare May 17, 2023 15:28
@jakubgs jakubgs marked this pull request as ready for review May 17, 2023 15:28
@jakubgs jakubgs requested a review from a team May 17, 2023 15:28
@siddarthkay
Copy link
Contributor

I tested this branch locally and found no issues in building and running the app on IOS Simulator.
Hot reloading on code changes also works as expected.
Looks good to me.

Makefile Outdated Show resolved Hide resolved
@jakubgs jakubgs force-pushed the ios/nix-built-jsbundle branch 2 times, most recently from 41d3f55 to d99c614 Compare May 17, 2023 17:47
For some unknown to me reason we are using a different Yarn call to
Shadow-cljs to generate the JSBundle for iOS builds, while the one
created by the Android derivation shoudl be exactly the same.

I'm changing the target to just be `make jsbundle` while keeping aliases
referencing old naming, and moving things around in `nix` folder to
reflect the fact that the derivation is no longer Android-specific.

Also, crucially, I've changed the `import` in `index.js` to use the
`./result/index.js` path, since that's what Nix creates. I'm not sure if
this clashes with any developer workflow that takes place locally, so
I'd appreciate some testing from developers.

Depends on: status-im/status-jenkins-lib#67

Signed-off-by: Jakub Sokołowski <[email protected]>
@jakubgs jakubgs merged commit 58d2096 into develop May 22, 2023
@jakubgs jakubgs deleted the ios/nix-built-jsbundle branch May 22, 2023 08:41
jakubgs added a commit that referenced this pull request May 30, 2023
Forgot to update this in:
#15924

Signed-off-by: Jakub Sokołowski <[email protected]>
jakubgs added a commit that referenced this pull request May 30, 2023
Forgot to update this in:
#15924

Signed-off-by: Jakub Sokołowski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants