Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ef1d924

Browse files
committedAug 31, 2024·
Merge branch 'master' into remove_other_type
2 parents f7d35c5 + 1d27d27 commit ef1d924

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+28202
-23849
lines changed
 

‎.github/workflows/ci_windows.yml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
include: [
16-
{ msystem: MSYS, arch: x86_64 },
1716
{ msystem: MINGW64, arch: x86_64 },
1817
{ msystem: MINGW32, arch: i686 }
1918
]
@@ -25,7 +24,6 @@ jobs:
2524

2625
- name: Setup MinGW native environment
2726
uses: msys2/setup-msys2@v2
28-
if: contains(matrix.msystem, 'MINGW')
2927
with:
3028
msystem: ${{ matrix.msystem }}
3129
update: false
@@ -34,29 +32,10 @@ jobs:
3432
mingw-w64-${{ matrix.arch }}-gcc
3533
mingw-w64-${{ matrix.arch }}-gcc-fortran
3634
mingw-w64-${{ matrix.arch }}-python
37-
mingw-w64-${{ matrix.arch }}-python-pip
38-
mingw-w64-${{ matrix.arch }}-python-setuptools
35+
mingw-w64-${{ matrix.arch }}-python-fypp
3936
mingw-w64-${{ matrix.arch }}-cmake
4037
mingw-w64-${{ matrix.arch }}-ninja
4138
42-
- name: Setup msys POSIX environment
43-
uses: msys2/setup-msys2@v2
44-
if: contains(matrix.msystem, 'MSYS')
45-
with:
46-
msystem: MSYS
47-
update: false
48-
install: >-
49-
git
50-
mingw-w64-x86_64-gcc
51-
mingw-w64-x86_64-gcc-fortran
52-
python
53-
python-pip
54-
cmake
55-
ninja
56-
57-
- name: Install fypp
58-
run: pip install fypp
59-
6039
- run: >-
6140
PATH=$PATH:/mingw64/bin/ cmake
6241
-Wdev

‎API-doc-FORD-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ project_website: https://stdlib.fortran-lang.org
4343
favicon: doc/media/favicon.ico
4444
license: by-sa
4545
author: fortran-lang/stdlib contributors
46-
author_pic: https://fortran-lang.org/assets/img/fortran_logo_512x512.png
46+
author_pic: https://fortran-lang.org/en/_static/fortran-logo-256x256.png
4747
email: fortran-lang@groups.io
4848
github: https://github.com/fortran-lang
4949
twitter: https://twitter.com/fortranlang

0 commit comments

Comments
 (0)
Please sign in to comment.