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 0ce2372

Browse files
committedApr 25, 2025·
Merge branch 'master' of github.com:fortran-lang/stdlib
2 parents 58074c7 + d8fd7b2 commit 0ce2372

File tree

278 files changed

+594590
-545263
lines changed

Some content is hidden

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

278 files changed

+594590
-545263
lines changed
 

‎.github/workflows/CI.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,25 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: [ubuntu-latest, macos-12]
22+
os: [ubuntu-latest, macos-13]
2323
toolchain:
2424
- {compiler: gcc, version: 10}
2525
- {compiler: gcc, version: 11}
2626
- {compiler: gcc, version: 12}
2727
- {compiler: gcc, version: 13}
28-
- {compiler: intel, version: '2024.1'}
29-
- {compiler: intel-classic, version: '2021.9'}
30-
build: [cmake]
28+
- {compiler: intel, version: '2024.1'}
29+
build: [cmake]
3130
include:
31+
- os: ubuntu-22.04
32+
build: cmake
33+
toolchain: {compiler: intel-classic, version: '2021.10'}
3234
- os: ubuntu-latest
3335
build: cmake-inline
34-
toolchain:
35-
- {compiler: gcc, version: 10}
36+
toolchain: {compiler: gcc, version: 10}
3637
exclude:
37-
- os: macos-12
38+
- os: macos-13
3839
toolchain: {compiler: intel, version: '2024.1'}
39-
- os: macos-12
40+
- os: macos-13
4041
toolchain: {compiler: gcc, version: 13}
4142
env:
4243
BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}
@@ -54,7 +55,7 @@ jobs:
5455
run: pip install --upgrade fypp ninja
5556

5657
- name: Setup Fortran compiler
57-
uses: fortran-lang/setup-fortran@v1.6.1
58+
uses: fortran-lang/setup-fortran@v1.6.2
5859
id: setup-fortran
5960
with:
6061
compiler: ${{ matrix.toolchain.compiler }}

‎.github/workflows/ci_windows.yml

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
include: [
16-
{ msystem: MSYS, arch: x86_64 },
17-
{ msystem: MINGW64, arch: x86_64 },
18-
{ msystem: MINGW32, arch: i686 }
16+
{ msystem: MINGW64, arch: x86_64 }
1917
]
2018
defaults:
2119
run:
@@ -25,7 +23,6 @@ jobs:
2523

2624
- name: Setup MinGW native environment
2725
uses: msys2/setup-msys2@v2
28-
if: contains(matrix.msystem, 'MINGW')
2926
with:
3027
msystem: ${{ matrix.msystem }}
3128
update: false
@@ -34,30 +31,10 @@ jobs:
3431
mingw-w64-${{ matrix.arch }}-gcc
3532
mingw-w64-${{ matrix.arch }}-gcc-fortran
3633
mingw-w64-${{ matrix.arch }}-python
37-
mingw-w64-${{ matrix.arch }}-python-pip
38-
mingw-w64-${{ matrix.arch }}-python-setuptools
34+
mingw-w64-${{ matrix.arch }}-python-fypp
3935
mingw-w64-${{ matrix.arch }}-cmake
4036
mingw-w64-${{ matrix.arch }}-ninja
4137
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-
60-
# Build and test with built-in BLAS and LAPACK
6138
- run: >-
6239
PATH=$PATH:/mingw64/bin/ cmake
6340
-Wdev
@@ -82,7 +59,7 @@ jobs:
8259
- name: CTest
8360
run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build --output-on-failure --parallel -V -LE quadruple_precision
8461

85-
- uses: actions/upload-artifact@v1
62+
- uses: actions/upload-artifact@v4
8663
if: failure()
8764
with:
8865
name: WindowsCMakeTestlog

0 commit comments

Comments
 (0)