Skip to content

Conversation

@oskirby
Copy link
Collaborator

@oskirby oskirby commented Jun 26, 2025

Description

As a prerequisite to supporting OSX cross compilation, we are going to need to add a bunch of tooling to the conda environment and rather than injecting a lot of cruft into the Android build environment, it would be best if we just split the Conda environments for Apple and Android targets.

For what it's worth, we have never really had a common environment anyways, since the conda_trim.sh script removes a lot of stuff from the Android environment.

Reference

Prerequisite for VPN-5276
Split from: #10584

Checklist

  • My code follows the style guidelines for this project
  • I have not added any packages that contain high risk or unknown licenses (GPL, LGPL, MPL, etc. consult with DevOps if in question)
  • I have performed a self review of my own code
  • I have commented my code PARTICULARLY in hard to understand areas
  • I have added thorough tests where needed

@oskirby oskirby requested a review from a team as a code owner June 26, 2025 05:25
@oskirby oskirby requested review from jcristau and strseb and removed request for a team June 26, 2025 05:25
env-android.yml Outdated
- rust-std-x86_64-linux-android=1.75
- rust-std-i686-linux-android=1.75
- rust-std-aarch64-linux-android=1.75
- go=1.22
Copy link
Collaborator

Choose a reason for hiding this comment

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

No need for go, we remove it in conda_trim :)

@oskirby oskirby changed the title VPN-5726: Split apple and android conda environments VPN-5276: Split apple and android conda environments Jun 26, 2025
@oskirby oskirby merged commit 358cd03 into main Jun 26, 2025
178 of 183 checks passed
@oskirby oskirby deleted the vpn-5726-conda-split-apple-android branch June 26, 2025 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants