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.

Sign up for GitHub

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

Jump to bottom

makefile: add missing TARGET for android-clean #10376

Merged
merged 4 commits into from
Apr 21, 2020
Merged

makefile: add missing TARGET for android-clean #10376

merged 4 commits into from
Apr 21, 2020

Conversation

jakubgs
Copy link
Member

@jakubgs jakubgs commented Apr 21, 2020 •
edited by StatusWrike
Loading

Changes:

  • Fixed make android-clean target failing due to lack of Gradle
  • Included small change that moves make nix-purge to nix/scripts/purge.sh for simplicity
  • Fixed Haste warnings about mode name collisions by changing blacklist in rn-cli.config.js
  • Got rid of the old TARGET_OS variable from Makefile

@jakubgs jakubgs requested a review from a team as a code owner April 21, 2020 10:16
@jakubgs jakubgs self-assigned this Apr 21, 2020
@status-github-bot
Copy link

Pull Request Checklist

  • Docs: Updated the documentation, if affected
  • Docs: Added or updated inline comments explaining intention of the code
  • Tests: Ensured that all new UI elements have been assigned accessibility IDs
  • Tests: Signaled need for E2E tests with label, if applicable
  • Tests: Briefly described what was tested and what platforms were used
  • UI: In case of UI changes, ensured that UI matches Figma
  • UI: In case of UI changes, requested review from a Core UI designer
  • UI: In case of UI changes, included screenshots of implementation

@jakubgs jakubgs mentioned this pull request Apr 21, 2020
Closed
@status-im-auto
Copy link
Member

status-im-auto commented Apr 21, 2020 •
edited
Loading

Jenkins Builds

Click to see older builds (9)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 2edb801 #1 2020-04-21 10:25:15 ~8 min ios 📦ipa 📲
✔️ 2edb801 #1 2020-04-21 10:26:56 ~10 min android-e2e 📦apk 📲
✔️ 2edb801 #1 2020-04-21 10:27:10 ~10 min android 📦apk 📲
✔️ b896b3a #3 2020-04-21 10:41:55 ~9 min ios 📦ipa 📲
✔️ b896b3a #3 2020-04-21 10:43:14 ~10 min android-e2e 📦apk 📲
✔️ b896b3a #3 2020-04-21 10:43:57 ~11 min android 📦apk 📲
✔️ b6b3e1c #4 2020-04-21 11:54:45 ~8 min ios 📦ipa 📲
✔️ b6b3e1c #4 2020-04-21 11:56:18 ~10 min android 📦apk 📲
✔️ b6b3e1c #4 2020-04-21 11:57:02 ~11 min android-e2e 📦apk 📲
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 844d4ab #5 2020-04-21 13:14:50 ~9 min ios 📦ipa 📲
✔️ 844d4ab #5 2020-04-21 13:16:25 ~10 min android-e2e 📦apk 📲
✔️ 844d4ab #5 2020-04-21 13:18:42 ~13 min android 📦apk 📲
✔️ 7427c6b #6 2020-04-21 20:41:00 ~9 min ios 📦ipa 📲
✔️ 7427c6b #6 2020-04-21 20:45:40 ~13 min android 📦apk 📲
✔️ 7427c6b #6 2020-04-21 20:45:49 ~13 min android-e2e 📦apk 📲

@jakubgs jakubgs force-pushed the fix/makefile-targets branch 2 times, most recently from b6b3e1c to 844d4ab Compare April 21, 2020 13:05
@jakubgs
makefile: add missing TARGET for android-clean
4670ae7 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
@jakubgs
nix: move nix-purge code to nix/scripts/purge.sh
918b03d 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
@jakubgs
nix: completely remove legacy TARGET_OS variable
e0b5bfc 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
@jakubgs
react-native: avoid Haste module naming collision warnings
34c30e0 
Warnings like this:

jest-haste-map: Haste module naming collision: StatusIm-Mobile
  The following files share their name; please adjust your hasteImpl:
    * <rootDir>/mobile/js_files/package.json
    * <rootDir>/package.json

Signed-off-by: Jakub Sokołowski <jakub@status.im>
@jakubgs jakubgs merged commit 34c30e0 into develop Apr 21, 2020
@delete-merged-branch delete-merged-branch bot deleted the fix/makefile-targets branch April 21, 2020 20:53
@weekly-digest weekly-digest bot mentioned this pull request Apr 26, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cammellos cammellos cammellos approved these changes

@0x-r4bbit 0x-r4bbit Awaiting requested review from 0x-r4bbit

@yenda yenda Awaiting requested review from yenda

@rasom rasom Awaiting requested review from rasom

@flexsurfer flexsurfer Awaiting requested review from flexsurfer

Assignees
No one assigned
Labels
android
Projects
No open projects
Legacy QA Automation Project
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jakubgs @status-im-auto @cammellos