Cleaned windows workflow, switched to macos12 (hopefully intel)

freesurfer · Sep 23, 2024 · df48e47 · df48e47
1 parent 3fc53eb
commit df48e47
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 71 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -13,7 +13,7 @@ jobs:
   example_matrix:
     strategy:
       matrix:
-        os: [macos-latest, macos-13]
+        os: [macos-latest, macos-12]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -9,8 +9,13 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  example_matrix:
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+
     runs-on: windows-2019
+
     if: ${{ startsWith(github.ref, 'refs/tags') || !contains(github.event.head_commit.message, '[skip ci]') }}
 
     steps:
@@ -21,7 +26,7 @@ jobs:
         git submodule update
 
     - name: Build zlib
-      run: |
+      run: | wl
          git clone https://github.com/madler/zlib.git
          md zlib-build
          cd zlib-build
@@ -39,73 +44,10 @@ jobs:
         cd ..
       shell: cmd
 
-    - name: Build and test samseg python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.8'
-        architecture: 'x64'
-    - run: |
-        python -m pip wheel . -w .\dist  --no-deps
-        python -m pip install . -f .\dist\
-        #python -m pip install -r requirements.txt
-        #python -m pip install pytest
-        #python -m pip install tensorflow
-        cd ..
-        python -c 'import samseg'
-        #python -m pytest samseg\samseg\tests
-        
-        rm samseg\gems\*.pyd
-        rm samseg\samseg\gems\Release\*.pyd
-      env:
-        ZLIB_INCLUDE_DIR: .\zlib-install\include
-        ZLIB_LIBRARY: .\zlib-install\lib\zlibstatic.lib
-
-    - name: Build and test samseg python 3.9
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.9'
-        architecture: 'x64'
-    - run: |
-        python -m pip wheel . -w .\dist  --no-deps
-        python -m pip install . -f .\dist\
-        #python -m pip install -r requirements.txt
-        #python -m pip install pytest
-        #python -m pip install tensorflow
-        cd ..
-        python -c 'import samseg'
-        #python -m pytest samseg\samseg\tests
-        
-        rm samseg\gems\*.pyd
-        rm samseg\samseg\gems\Release\*.pyd
-      env:
-        ZLIB_INCLUDE_DIR: .\zlib-install\include
-        ZLIB_LIBRARY: .\zlib-install\lib\zlibstatic.lib
-        
-    - name: Build and test samseg python 3.10
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.10'
-        architecture: 'x64'
-    - run: |
-        python -m pip wheel . -w .\dist  --no-deps
-        python -m pip install . -f .\dist\
-        #python -m pip install -r requirements.txt
-        #python -m pip install pytest
-        #python -m pip install tensorflow
-        cd ..
-        python -c 'import samseg'
-        #python -m pytest samseg\samseg\tests
-        
-        rm samseg\gems\*.pyd
-        rm samseg\samseg\gems\Release\*.pyd
-      env:
-        ZLIB_INCLUDE_DIR: .\zlib-install\include
-        ZLIB_LIBRARY: .\zlib-install\lib\zlibstatic.lib
-        
-    - name: Build and test samseg python 3.11
-      uses: actions/setup-python@v2
+    - name: Build and test samseg python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: ${{ matrix.python-version }}
         architecture: 'x64'
     - run: |
         python -m pip wheel . -w .\dist  --no-deps
@@ -115,10 +57,10 @@ jobs:
         #python -m pip install tensorflow
         cd ..
         python -c 'import samseg'
-        #python -m pytest samseg\samseg\tests
+        # python -m pytest samseg\samseg\tests
         
         rm samseg\gems\*.pyd
-        rm samseg\samseg\gems\Release\*.pyd
+        rm samseg\gems\Release\*.pyd
       env:
         ZLIB_INCLUDE_DIR: .\zlib-install\include
         ZLIB_LIBRARY: .\zlib-install\lib\zlibstatic.lib