test github actions

CICE-Consortium · Aug 7, 2023 · 05c47b8 · 05c47b8
1 parent 9bc5b61
commit 05c47b8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 34 deletions.
diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml
@@ -64,21 +64,6 @@ jobs:
           echo "OS: ${{ matrix.os }}"
           echo "ENVDEF: ${{ matrix.envdef }}"
           echo "MINICOND: ${{ matrix.minicond }}"
-          echo "tcx1"
-          ls -alr /System/Library/Frameworks/Security.framework
-          echo "tcx2"
-          ls -alr /System/Library/Frameworks/Security.framework/Versions
-          echo "tcx3"
-          ls -alr /System/Library/Frameworks/Security.framework/Versions/A
-          echo "tcx4"
-          ls -alr /System/Library/Frameworks/Security.framework/Versions/A/Security
-          echo "tcx5"
-          env
-          echo "tcx6"
-          env | grep -i frameworks
-          echo "tcx7"
-          echo "tcx8"
-          echo "tcx9"
       - name : install miniconda
         shell: /bin/bash {0}
         run: |
@@ -117,24 +102,26 @@ jobs:
           conda env create -f configuration/scripts/machines/environment.yml
       - name: check conda env
         run: |
-          conda activate cice && which mpicc && which mpifort && which make
+          conda activate cice && which clang && which gfortran && which mpicc && which mpifort && which make
+          clang --version
+          gfortran --version
           mpifort --version
           mpicc --version
           make --version
-          echo "mpifort -v:"
-          mpifort -v
-          echo "mpifort --showme:compile:"
-          mpifort --showme:compile
-          echo "mpifort --showme:link:"
-          mpifort --showme:link
-          echo "mpifort --showme:command:"
-          mpifort --showme:command
-          echo "mpifort --showme:libdirs:"
-          mpifort --showme:libdirs
-          echo "mpifort --showme:libs:"
-          mpifort --showme:libs
-          echo "mpifort --showme:incdirs:"
-          mpifort --showme:incdirs
+#          echo "mpifort -v:"
+#          mpifort -v
+#          echo "mpifort --showme:compile:"
+#          mpifort --showme:compile
+#          echo "mpifort --showme:link:"
+#          mpifort --showme:link
+#          echo "mpifort --showme:command:"
+#          mpifort --showme:command
+#          echo "mpifort --showme:libdirs:"
+#          mpifort --showme:libdirs
+#          echo "mpifort --showme:libs:"
+#          mpifort --showme:libs
+#          echo "mpifort --showme:incdirs:"
+#          mpifort --showme:incdirs
       - name: check setup case
         run: |
           cd $HOME/cice

diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos
@@ -6,7 +6,7 @@
 CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
 
 # Flags for the C compiler
-CFLAGS     := -c -O2 -target x86_64-apple-darwin
+CFLAGS     := -c -O2
 
 # Flags for the Fortran compiler
 FREEFLAGS  := -ffree-form
@@ -37,9 +37,6 @@ endif
 
 # Linker
 LD:= $(FC)
-##LDFLAGS += --no-warn-mismatch
-##LDFLAGS += --noinhibit-exec
-##LDFLAGS += -L/usr/local/opt/openssl/lib
 
 # Location of the compiled Fortran modules (NetCDF)
 MODDIR  += -I$(CONDA_PREFIX)/include -I$(CONDA_PREFIX)/lib