Skip to content

Commit 5e0c62a

Browse files
authored
Merge pull request #29 from zoziha/fix-ci-1
Update the outdated CI environment configuration
2 parents 8f1f4e4 + f7ec0d0 commit 5e0c62a

File tree

2 files changed

+32
-9
lines changed

2 files changed

+32
-9
lines changed

.github/workflows/doc-deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
python-version: '3.x'
1313

1414
- name: Install dependencies
15-
run: pip install -v ford==6.1.5
15+
run: pip install -v ford==6.1.17
1616

1717
- name: Build Documentation
1818
run: ford API-doc-FORD-file.md

.github/workflows/fpm.yml

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,20 @@ name: fpm
33
on: [push, pull_request]
44

55
jobs:
6-
build:
6+
gcc-build:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
fail-fast: false
1010
matrix:
11-
os: [ubuntu-latest, macos-latest, windows-latest]
11+
os: [ubuntu-latest, macos-11]
1212
gcc_v: [10] # Version of GFortran we want to use.
1313
include:
1414
- os: ubuntu-latest
1515
os-arch: linux-x86_64
1616

17-
- os: macos-latest
17+
- os: macos-11
1818
os-arch: macos-x86_64
1919

20-
- os: windows-latest
21-
os-arch: windows-x86_64
22-
# Windows GFortran Version: 8.1
23-
2420
env:
2521
FC: gfortran
2622
GCC_V: ${{ matrix.gcc_v }}
@@ -35,6 +31,7 @@ jobs:
3531
ln -s /usr/local/bin/gfortran-${GCC_V} /usr/local/bin/gfortran
3632
which gfortran-${GCC_V}
3733
which gfortran
34+
3835
- name: Install GFortran Linux
3936
if: contains(matrix.os, 'ubuntu')
4037
run: |
@@ -45,7 +42,7 @@ jobs:
4542
- name: Install fpm
4643
uses: fortran-lang/setup-fpm@v3
4744
with:
48-
fpm-version: 'v0.5.0'
45+
fpm-version: 'v0.7.0'
4946

5047
- name: Build fftpack
5148
run: |
@@ -57,3 +54,29 @@ jobs:
5754
gfortran --version
5855
fpm test
5956
57+
msys2-build:
58+
runs-on: windows-latest
59+
defaults:
60+
run:
61+
shell: msys2 {0}
62+
63+
steps:
64+
- uses: actions/checkout@v2
65+
- uses: msys2/setup-msys2@v2
66+
with:
67+
msystem: MINGW64
68+
update: true
69+
path-type: inherit
70+
install: |
71+
mingw-w64-x86_64-gcc-fortran
72+
mingw-w64-x86_64-fpm
73+
74+
- name: fpm build
75+
run: |
76+
gfortran --version
77+
fpm --version
78+
fpm build
79+
80+
- name: fpm test
81+
run: |
82+
fpm test

0 commit comments

Comments
 (0)