Trying to merge linux and mac builds.

threeML · Aug 17, 2022 · dede2e0 · dede2e0
1 parent 1f1f7f4
commit dede2e0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 152 deletions.
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -83,8 +83,7 @@ jobs:
                   if [[ "${{matrix.os}}" == "ubuntu-latest" ]]; then
                   
                   #conda install -c conda-forge boa -n base
-                  #conda mambabuild --no-build-id --python=${{matrix.python-version}} conda_recipe/xspec-modelsonly-linux
-                  conda build --no-build-id --python=${{matrix.python-version}} conda_recipe/xspec-modelsonly-linux
+                  conda build --python=${{matrix.python-version}} conda_recipe/xspec-modelsonly
 
                   else
                   curl -LO -z MacOSX10.9.sdk.tar.xz https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX10.9.sdk.tar.xz
@@ -155,7 +154,7 @@ jobs:
                   conda install -c conda-forge boa -n base
 
                   if [[ "${{matrix.os}}" == "ubuntu-latest" ]]; then
-                  conda mambabuild --no-build-id --python=${{matrix.python-version}} conda_recipe/xspec-modelsonly-linux
+                  conda mambabuild --no-build-id --python=${{matrix.python-version}} conda_recipe/xspec-modelsonly
 
                   else
                   # there is some strange error about the prefix length

diff --git a/conda_recipe/xspec-modelsonly-linux/.gitattributes b/conda_recipe/xspec-modelsonly-linux/.gitattributes
diff --git a/conda_recipe/xspec-modelsonly-linux/build.sh b/conda_recipe/xspec-modelsonly-linux/build.sh
diff --git a/conda_recipe/xspec-modelsonly-linux/conda_build_config.yaml b/conda_recipe/xspec-modelsonly-linux/conda_build_config.yaml
diff --git a/conda_recipe/xspec-modelsonly-linux/meta.yaml b/conda_recipe/xspec-modelsonly-linux/meta.yaml
diff --git a/conda_recipe/xspec-modelsonly/conda_build_config.yaml b/conda_recipe/xspec-modelsonly/conda_build_config.yaml
@@ -1,8 +1,6 @@
 c_compiler:
-  - gcc # [linux]
   - clang # [osx]
 cxx_compiler:
-  - gxx # [linux]
   - clangxx # [osx]
 fortran_compiler:
   - gfortran # [osx]