Split up runs

.github/workflows/build_variants.yml

@@ -20,16 +20,14 @@ jobs:
         name: CrysFML - Linux
         path: ${{ github.workspace }}/dist/*.whl
 
-  create-Others:
+  create-OSX:
     strategy:
       max-parallel: 4
       matrix:
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
-        os: [macos-10.15, macos-11.0, windows-latest]
+        os: [macos-10.15, macos-11.0]
         gcc_v: [ 10 ] # Version of GFortran we want to use.
         exclude:
-#          - os: windows-latest
-#            python-version: '3.6'
           - os: macos-10.15
             python-version: '3.6'
           - os: macos-11.0
@@ -48,28 +46,46 @@ jobs:
         python-version: ${{matrix.python-version}}
 
     - name: Install cmake
-      run: pip3 install cmake
-
-    - name: Build CFML (Windows)
-      if: contains(matrix.os, 'windows')
-      env:
-        FC: gfortran
-        CC: gcc
-      run: pip3 wheel ./ --no-deps -w ./dist/
+      run: pip3 install cmake delocate
 
     - name: Build CFML (OSX)
-      if: contains(matrix.os, 'macos')
       env:
         FC: gfortran-${{ matrix.gcc_v }}
         CC: gcc-${{ matrix.gcc_v }}
       run: |
         pip3 wheel ./ --no-deps -w ./dist/
-        pip3 install delocate
         delocate-wheel -w fixed_wheels -v ./dist/*.whl
-        mv ./dist ./old
-        mv ./fixed_wheels ./dist
 
     - uses: actions/upload-artifact@v2
       with:
         name: CrysFML - ${{ matrix.os }} - Python ${{ matrix.python-version }}
-        path: ./dist/*.whl
\ No newline at end of file
+        path: ./fixed/*.whl
+
+  create-Windows:
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10' ]
+        os: [ windows-latest ]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup python
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{matrix.python-version}}
+
+      - name: Install cmake
+        run: pip3 install cmake
+
+      - name: Build CFML (Windows)
+        if: contains(matrix.os, 'windows')
+        run: pip3 wheel ./ --no-deps -w ./dist/
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: CrysFML - ${{ matrix.os }} - Python ${{ matrix.python-version }}
+          path: ./dist/*.whl
\ No newline at end of file