Unverified Commit a4cf373f authored by Simon Ward's avatar Simon Ward
Browse files

More win fun

parent 419648a4
...@@ -6,62 +6,62 @@ on: ...@@ -6,62 +6,62 @@ on:
branches: [ simon ] branches: [ simon ]
jobs: jobs:
create-Linux: # create-Linux:
runs-on: ubuntu-latest # runs-on: ubuntu-latest
#
steps: # steps:
- uses: actions/checkout@v2 # - uses: actions/checkout@v2
#
- name: Build manylinux wheels # - name: Build manylinux wheels
run: docker run -e PLAT=manylinux2010_x86_64 -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/Scripts/buildscript.sh # run: docker run -e PLAT=manylinux2010_x86_64 -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/Scripts/buildscript.sh
#
- uses: actions/upload-artifact@v2 # - uses: actions/upload-artifact@v2
with: # with:
name: CrysFML - Linux # name: CrysFML - Linux
path: ${{ github.workspace }}/dist/*.whl # path: ${{ github.workspace }}/dist/*.whl
#
create-OSX: # create-OSX:
strategy: # strategy:
max-parallel: 4 # max-parallel: 4
matrix: # matrix:
python-version: ['3.6', '3.7', '3.8', '3.9'] # python-version: ['3.6', '3.7', '3.8', '3.9']
os: [macos-10.15] # os: [macos-10.15]
gcc_v: [ 10 ] # Version of GFortran we want to use. # gcc_v: [ 10 ] # Version of GFortran we want to use.
# exclude: # Currently only python > 3.8 is supported on macos-11.0 and > 3.6 on macos-10.15 ## exclude: # Currently only python > 3.8 is supported on macos-11.0 and > 3.6 on macos-10.15
# - os: macos-11.0 ## - os: macos-11.0
# python-version: '3.7' ## python-version: '3.7'
# - os: macos-11.0 ## - os: macos-11.0
# python-version: '3.8' ## python-version: '3.8'
#
runs-on: ${{ matrix.os }} # runs-on: ${{ matrix.os }}
#
steps: # steps:
- uses: actions/checkout@v2 # - uses: actions/checkout@v2
#
- name: Setup python # - name: Setup python
uses: actions/setup-python@v1 # uses: actions/setup-python@v1
with: # with:
python-version: ${{matrix.python-version}} # python-version: ${{matrix.python-version}}
#
- name: Install cmake # - name: Install cmake
run: pip3 install cmake delocate wheel # run: pip3 install cmake delocate wheel
#
- name: Build CFML (OSX) # - name: Build CFML (OSX)
env: # env:
FC: gfortran-${{ matrix.gcc_v }} # FC: gfortran-${{ matrix.gcc_v }}
CC: gcc-${{ matrix.gcc_v }} # CC: gcc-${{ matrix.gcc_v }}
run: | # run: |
pip3 wheel ./ --no-deps -w ./old/ # pip3 wheel ./ --no-deps -w ./old/
delocate-wheel -w dist -v ./old/*.whl # delocate-wheel -w dist -v ./old/*.whl
#
- uses: actions/upload-artifact@v2 # - uses: actions/upload-artifact@v2
with: # with:
name: CrysFML - ${{ matrix.os }} - Python ${{ matrix.python-version }} # name: CrysFML - ${{ matrix.os }} - Python ${{ matrix.python-version }}
path: ./dist/*.whl # path: ./dist/*.whl
create-Windows: create-Windows:
strategy: strategy:
max-parallel: 4 max-parallel: 1
matrix: matrix:
python-version: [ '3.6', '3.7'] python-version: [ '3.6', '3.7']
os: [ windows-latest ] os: [ windows-latest ]
...@@ -69,6 +69,10 @@ jobs: ...@@ -69,6 +69,10 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: switch git-bash shell to msys2 shell by adding msys2 path to PATH front
run: echo "C:\msys64\usr\bin" >> $GITHUB_PATH
shell: bash
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Setup python - name: Setup python
...@@ -79,16 +83,16 @@ jobs: ...@@ -79,16 +83,16 @@ jobs:
- name: Install wheel - name: Install wheel
run: pip install wheel run: pip install wheel
- uses: msys2/setup-msys2@v2 # - uses: msys2/setup-msys2@v2
with: # with:
msystem: MSYS # msystem: MSYS
install: cmake mingw-w64-x86_64-toolchain # install: cmake mingw-w64-x86_64-toolchain
update: true # update: true
path-type: inherit # path-type: inherit
- name: Build CFML - name: Build CFML
shell: msys2 {0} # shell: msys2 {0}
id: build # id: build
run: pip wheel ./ --no-deps -w ./dist/ run: pip wheel ./ --no-deps -w ./dist/
env: env:
MINGW_ARCH: MINGW64 MINGW_ARCH: MINGW64
...@@ -98,22 +102,22 @@ jobs: ...@@ -98,22 +102,22 @@ jobs:
name: CrysFML - ${{ matrix.os }} - Python ${{ matrix.python-version }} name: CrysFML - ${{ matrix.os }} - Python ${{ matrix.python-version }}
path: ./dist/*.whl path: ./dist/*.whl
Upload_Artifacts: # Upload_Artifacts:
runs-on: ubuntu-latest # runs-on: ubuntu-latest
needs: [create-Linux, create-OSX, create-Windows] # needs: [create-Linux, create-OSX, create-Windows]
steps: # steps:
- uses: actions/checkout@v2 # - uses: actions/checkout@v2
- uses: actions/download-artifact@v2 # - uses: actions/download-artifact@v2
- name: Upload Artifacts GitHub releases # - name: Upload Artifacts GitHub releases
# if: github.event_name == 'push' ## if: github.event_name == 'push'
uses: ncipollo/release-action@v1 # uses: ncipollo/release-action@v1
with: # with:
draft: falase # draft: falase
prerelease: true # prerelease: true
allowUpdates: true # allowUpdates: true
replacesArtifacts: true # replacesArtifacts: true
token: ${{ secrets.GITHUB_TOKEN }} # token: ${{ secrets.GITHUB_TOKEN }}
artifacts: "./dist/*.whl" # artifacts: "./dist/*.whl"
# tag: ${{ env.BRANCH_NAME }} ## tag: ${{ env.BRANCH_NAME }}
# commit: ${{ env.BRANCH_NAME }} ## commit: ${{ env.BRANCH_NAME }}
bodyFile: "RELEASE.md" # bodyFile: "RELEASE.md"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment