YOLO: Split conda environments into Windows and Unix versions

mozilla-mobile · Aug 27, 2024 · 6cdd295 · 6cdd295
1 parent 0edcc49
commit 6cdd295
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 18 deletions.
diff --git a/.github/workflows/auth_tests.yml b/.github/workflows/auth_tests.yml
@@ -61,7 +61,6 @@ jobs:
 
       - name: Install build dependencies
         run: |
-          ./scripts/macos/conda_install_extras.sh
           export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
           brew install ninja
 

diff --git a/.github/workflows/macos_tests.yaml b/.github/workflows/macos_tests.yaml
@@ -37,7 +37,6 @@ jobs:
 
       - name: Install build dependencies
         run: |
-          ./scripts/macos/conda_install_extras.sh
           export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
           brew install ninja
 

diff --git a/.github/workflows/test_unit.yaml b/.github/workflows/test_unit.yaml
@@ -81,7 +81,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          ./scripts/macos/conda_install_extras.sh
           export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
           brew install ninja
 

diff --git a/docs/Building/ios.md b/docs/Building/ios.md
@@ -22,7 +22,6 @@ Install extra conda packages
 
 ```bash 
 $ conda activate vpn
-$ ./scripts/macos/conda_install_extras.sh
 ```
 
 

diff --git a/docs/Building/macos.md b/docs/Building/macos.md
@@ -14,10 +14,6 @@ Apple ID. If you are a Mozilla developer, this is an Apple ID associated with yo
 
 See [here](./index.md#conda) for conda environment instructions.
 
-Install extra conda packages
-
-    ./scripts/macos/conda_install_extras.sh
-
 Your Xcode install comes with a copy of the MacOS-SDK.
 We need to tell the conda environment where to find it.
 

diff --git a/docs/Building/windows.md b/docs/Building/windows.md
@@ -27,8 +27,6 @@ $ conda activate vpn
 $ ./scripts/windows/conda_setup_win_sdk.ps1
 # Setup the conda env to use a prebuild Qt from Moz-CI
 $ ./scripts/windows/conda_setup_win_qt.ps1
-# Install conda Packages only needed on Windows
-$ ./scripts/windows/conda_install_extras.ps1
 # Reactivate the env to apply the changes:
 $ conda deactivate
 $ conda activate vpn

diff --git a/env-windows.yml b/env-windows.yml
@@ -0,0 +1,31 @@
+name: vpn
+channels:
+  - conda-forge
+dependencies:
+  - clang=14.0.6
+  - clang-tools=14.0.6
+  - clangxx=14.0.6
+  - m2w64-gcc=5.3.0
+  - llvm=14.0.6
+  - llvmdev=14.0.6
+  - lld=14.0.6
+  - python=3.9
+  - nodejs=18.16.*
+  - pip=22.3.1
+  - rust=1.75
+  - rust-std-aarch64-apple-ios=1.75
+  - rust-std-x86_64-apple-ios=1.75
+  - rust-std-armv7-linux-androideabi=1.75
+  - rust-std-x86_64-linux-android=1.75
+  - rust-std-i686-linux-android=1.75
+  - rust-std-aarch64-linux-android=1.75
+  - go=1.18
+  - compiler-rt
+  - cmake=3.26.3
+  - ninja=1.11.0
+  - conda-forge::openjdk=17
+  - pip:
+      - -r requirements.txt
+      - -r taskcluster/scripts/requirements.txt
+variables:
+  QT_VERSION: 6.6.3
diff --git a/env.yml b/env.yml
@@ -5,6 +5,7 @@ dependencies:
   - clang=14.0.6
   - clang-tools=14.0.6
   - clangxx=14.0.6
+  - cctools=973.0.1
   - python=3.9
   - nodejs=18.16.*
   - pip=22.3.1

diff --git a/taskcluster/kinds/toolchain/conda_osx.yml b/taskcluster/kinds/toolchain/conda_osx.yml
@@ -18,7 +18,6 @@ task-defaults:
         resources:
             - requirements.txt
             - env.yml
-            - scripts/macos/conda_install_extras.sh
             - scripts/macos/conda_setup_qt.sh
 
 

diff --git a/taskcluster/kinds/toolchain/conda_windows.yml b/taskcluster/kinds/toolchain/conda_windows.yml
@@ -19,7 +19,6 @@ windows-conda-pack:
         run:
             script: conda_pack_windows.ps1
             resources:
-                - scripts/windows/conda_install_extras.ps1
                 - scripts/windows/conda_setup_win_qt.ps1
                 - scripts/windows/conda_setup_win_sdk.ps1
             toolchain-alias: conda-windows-x86_64

diff --git a/taskcluster/scripts/toolchain/conda_pack_ios.sh b/taskcluster/scripts/toolchain/conda_pack_ios.sh
@@ -37,7 +37,6 @@ conda env config vars set QT_VERSION=${BACKUP_QT_VERSION}
 env
 conda deactivate
 conda activate vpn
-./scripts/macos/conda_install_extras.sh
 ./scripts/macos/conda_setup_qt.sh
 
 conda deactivate

diff --git a/taskcluster/scripts/toolchain/conda_pack_macos.sh b/taskcluster/scripts/toolchain/conda_pack_macos.sh
@@ -28,10 +28,7 @@ pip config debug
 
 echo "Installing provided conda env..."
 conda env create -f ${VCS_PATH}/env.yml
-conda activate VPN
-${VCS_PATH}/scripts/macos/conda_install_extras.sh  
-conda info
-conda deactivate
+conda env run -n VPN conda env info
 
 echo "Installing conda-pack..."
 conda install conda-pack -y

diff --git a/taskcluster/scripts/toolchain/conda_pack_windows.ps1 b/taskcluster/scripts/toolchain/conda_pack_windows.ps1
@@ -39,7 +39,6 @@ conda info --envs
 
 conda activate VPN
 . "$REPO_ROOT_PATH\scripts\windows\conda_setup_win_sdk.ps1" # <- This download's all sdk things we need :3 
-. "$REPO_ROOT_PATH\scripts\windows\conda_install_extras.ps1" # <- Downloads gcc. 
 conda deactivate
 conda activate VPN