update to new meson and revert changes

mdolab · Feb 15, 2024 · cb1f639 · cb1f639
1 parent 80d9154
commit cb1f639
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/environment.yml b/.github/environment.yml
@@ -4,10 +4,8 @@ dependencies:
   - numpy >=1.16
   - ipopt
   - swig
-  - meson >=1.3.1
+  - meson >=1.3.2
   - compilers
-  - flang
-  - lld
   - pkg-config
   - pip
   - setuptools
@@ -17,4 +15,4 @@ dependencies:
   - testflo
   - scipy >1.2
   - mdolab-baseclasses >=1.3.1
-  - sqlitedict >=1.6
+  - sqlitedict >=1.6
diff --git a/.github/windows.yaml b/.github/windows.yaml
@@ -30,6 +30,7 @@ jobs:
         set IPOPT_DIR=%CONDA_PREFIX%\Library
         set CC=cl
         set FC=flang
+        set CC_LD=link
         python -m build -n -x .
         pip install --no-deps --no-index --find-links dist pyoptsparse
       displayName: Build and install pyoptsparse

diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -34,6 +34,7 @@ jobs:
           set IPOPT_DIR=%CONDA_PREFIX%\Library
           set CC=cl
           set FC=flang
+          set CC_LD=link
           python -m build -n -x .
           pip install --no-deps --no-index --find-links dist pyoptsparse
       - name: Run tests