for easier workflow

yumengch · Jul 23, 2024 · db14f32 · db14f32
1 parent 267b470
commit db14f32
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/conda_build_linux.yaml b/.github/workflows/conda_build_linux.yaml
@@ -1,7 +1,7 @@
 name: conda_build_linux
 on: [workflow_dispatch, pull_request]
 jobs:
-  upload_conda_mac_m1:
+  upload_conda_linux:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -13,6 +13,7 @@ jobs:
         with:
           auto-activate-base: true
           auto-update-conda: true
+          activate-environment: ""
 
       - name: install pyPDAF
         shell: bash -el {0}

diff --git a/.github/workflows/conda_build_mac_intel.yaml b/.github/workflows/conda_build_mac_intel.yaml
@@ -13,15 +13,20 @@ jobs:
         with:
           auto-activate-base: true
           auto-update-conda: true
+          activate-environment: ""
 
-      - name: install pyPDAF
+      - name: build pyPDAF
         shell: bash -el {0}
         run: |
           cp PDAFBuild/setup_conda_intel_mac.cfg setup.cfg
           conda install python anaconda-client conda-build conda-verify
           anaconda login --username yumengch --password ${{ secrets.ANACONDA }}
           conda  config --set anaconda_upload no
           conda-build -c conda-forge conda.recipe/
+
+      - name: install pyPDAF
+        shell: bash -el {0}
+        run: |
           conda install -y -c conda-forge --use-local pypdaf
           mv example/config_mac.py example/config.py
           mv example/config_obsA_mac.py example/config_obsA.py

diff --git a/.github/workflows/conda_build_mac_m1.yaml b/.github/workflows/conda_build_mac_m1.yaml
@@ -13,15 +13,20 @@ jobs:
         with:
           auto-activate-base: true
           auto-update-conda: true
+          activate-environment: ""
 
-      - name: install pyPDAF
+      - name: build pyPDAF
         shell: bash -el {0}
         run: |
           cp PDAFBuild/setup_conda_m1_mac.cfg setup.cfg
           conda install python anaconda-client conda-build conda-verify
           anaconda login --username yumengch --password ${{ secrets.ANACONDA }}
           conda  config --set anaconda_upload no
           conda-build -c conda-forge conda.recipe/
+
+      - name: install pyPDAF
+        shell: bash -el {0}
+        run: |
           conda install -y -c conda-forge --use-local pypdaf
           mv example/config_mac.py example/config.py
           mv example/config_obsA_mac.py example/config_obsA.py

diff --git a/PDAFBuild/setup_conda_intel_mac.cfg b/PDAFBuild/setup_conda_intel_mac.cfg
@@ -13,7 +13,7 @@ condaBuild = True
 c_compiler = clang
 fortran_compiler = gfortran
 # if MKL is used, give the path to the static MKL library
-use_MKL=True
+use_MKL=False
 MKLROOT=
 # if dynamic/shared liblapack and libblas library is used,
 # give the library path and flags

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -19,9 +19,9 @@ requirements:
     - numpy
     - mpi4py
     - {{ mpi }}
-    - mkl-static                 # [x86]
-    - blas-devel                 # [not x86]
-    - liblapack                  # [not x86]
+    - mkl-static                 # [not osx]
+    - blas-devel                 # [osx]
+    - liblapack                  # [osx]
   build:
     - {{ compiler('c') }}
     - {{ compiler('fortran') }}  # [not win]