Skip to content

Commit abcd256

Browse files
committed
Clean up CI, run all on push only
1 parent ca8fc47 commit abcd256

File tree

5 files changed

+56
-144
lines changed

5 files changed

+56
-144
lines changed

.github/PULL_REQUEST_TEMPLATE.md

-4
This file was deleted.

.github/workflows/CI.yml

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on: push
44

55
env:
66
CMAKE_BUILD_PARALLEL_LEVEL: "2" # 2 cores on each GHA VM, enable parallel builds
77
CTEST_OUTPUT_ON_FAILURE: "ON" # This way we don't need a flag to ctest
88
CTEST_PARALLEL_LEVEL: "2"
9-
CTEST_TIME_TIMEOUT: "5" # some failures hang forever
9+
CTEST_TIME_TIMEOUT: "5" # some failures hang forever
1010
HOMEBREW_NO_ANALYTICS: "ON" # Make Homebrew installation a little quicker
1111
HOMEBREW_NO_AUTO_UPDATE: "ON"
1212
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: "ON"
@@ -21,71 +21,71 @@ jobs:
2121
matrix:
2222
os: [ubuntu-latest, macos-12]
2323
toolchain:
24-
- {compiler: gcc, version: 10}
25-
- {compiler: gcc, version: 11}
26-
- {compiler: gcc, version: 12}
27-
- {compiler: gcc, version: 13}
28-
- {compiler: intel, version: '2024.1'}
29-
- {compiler: intel-classic, version: '2021.9'}
24+
- { compiler: gcc, version: 10 }
25+
- { compiler: gcc, version: 11 }
26+
- { compiler: gcc, version: 12 }
27+
- { compiler: gcc, version: 13 }
28+
- { compiler: intel, version: "2024.1" }
29+
- { compiler: intel-classic, version: "2021.9" }
3030
build: [cmake]
3131
include:
3232
- os: ubuntu-latest
3333
build: cmake-inline
3434
toolchain:
35-
- {compiler: gcc, version: 10}
35+
- { compiler: gcc, version: 10 }
3636
exclude:
3737
- os: macos-12
38-
toolchain: {compiler: intel, version: '2024.1'}
38+
toolchain: { compiler: intel, version: "2024.1" }
3939
- os: macos-12
40-
toolchain: {compiler: gcc, version: 13}
40+
toolchain: { compiler: gcc, version: 13 }
4141
env:
4242
BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}
4343

4444
steps:
45-
- name: Checkout code
46-
uses: actions/checkout@v4
45+
- name: Checkout code
46+
uses: actions/checkout@v4
4747

48-
- name: Set up Python 3.x
49-
uses: actions/setup-python@v5 # Use pip to install latest CMake, & FORD/Jin2For, etc.
50-
with:
51-
python-version: 3.x
48+
- name: Set up Python 3.x
49+
uses: actions/setup-python@v5 # Use pip to install latest CMake, & FORD/Jin2For, etc.
50+
with:
51+
python-version: 3.x
5252

53-
- name: Install fypp
54-
run: pip install --upgrade fypp ninja
53+
- name: Install fypp
54+
run: pip install --upgrade fypp ninja
5555

56-
- name: Setup Fortran compiler
57-
uses: fortran-lang/[email protected]
58-
id: setup-fortran
59-
with:
60-
compiler: ${{ matrix.toolchain.compiler }}
61-
version: ${{ matrix.toolchain.version }}
56+
- name: Setup Fortran compiler
57+
uses: fortran-lang/[email protected]
58+
id: setup-fortran
59+
with:
60+
compiler: ${{ matrix.toolchain.compiler }}
61+
version: ${{ matrix.toolchain.version }}
6262

63-
- name: Configure with CMake
64-
if: ${{ contains(matrix.build, 'cmake') }}
65-
run: >-
66-
cmake -Wdev -G Ninja
67-
-DCMAKE_BUILD_TYPE=Release
68-
-DCMAKE_MAXIMUM_RANK:String=4
69-
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
70-
-S . -B ${{ env.BUILD_DIR }}
63+
- name: Configure with CMake
64+
if: ${{ contains(matrix.build, 'cmake') }}
65+
run: >-
66+
cmake -Wdev -G Ninja
67+
-DCMAKE_BUILD_TYPE=Release
68+
-DCMAKE_MAXIMUM_RANK:String=4
69+
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
70+
-S . -B ${{ env.BUILD_DIR }}
7171
72-
- name: Build and compile
73-
if: ${{ contains(matrix.build, 'cmake') }}
74-
run: cmake --build ${{ env.BUILD_DIR }} --parallel
72+
- name: Build and compile
73+
if: ${{ contains(matrix.build, 'cmake') }}
74+
run: cmake --build ${{ env.BUILD_DIR }} --parallel
7575

76-
- name: catch build fail
77-
run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
78-
if: ${{ failure() && contains(matrix.build, 'cmake') }}
76+
- name: catch build fail
77+
run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
78+
if: ${{ failure() && contains(matrix.build, 'cmake') }}
7979

80-
- name: test
81-
if: ${{ contains(matrix.build, 'cmake') }}
82-
run: >-
83-
ctest
84-
--test-dir ${{ env.BUILD_DIR }}
85-
--parallel
86-
--output-on-failure
87-
--no-tests=error
80+
- name: test
81+
if: ${{ contains(matrix.build, 'cmake') }}
82+
run: >-
83+
ctest
84+
--test-dir ${{ env.BUILD_DIR }}
85+
--parallel
86+
--output-on-failure
87+
--no-tests=error
8888
89-
- name: Install project
90-
if: ${{ contains(matrix.build, 'cmake') }}
91-
run: cmake --install ${{ env.BUILD_DIR }}
89+
- name: Install project
90+
if: ${{ contains(matrix.build, 'cmake') }}
91+
run: cmake --install ${{ env.BUILD_DIR }}

.github/workflows/PR-review.yml

-17
This file was deleted.

.github/workflows/doc-deployment.yml

-66
This file was deleted.

.github/workflows/fpm-deployment.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: fpm-deployment
22

3-
on: [push, pull_request]
3+
on: push
44

55
jobs:
66
test:
@@ -10,7 +10,7 @@ jobs:
1010
matrix:
1111
include:
1212
- os: ubuntu-latest
13-
toolchain: {compiler: gcc, version: 13}
13+
toolchain: { compiler: gcc, version: 13 }
1414

1515
steps:
1616
- name: Checkout code
@@ -33,19 +33,18 @@ jobs:
3333
- name: Setup Fortran Package Manager
3434
uses: fortran-lang/setup-fpm@v5
3535
with:
36-
fpm-version: 'v0.10.0'
36+
fpm-version: "v0.10.0"
3737

3838
- run: | # Just for deployment: create stdlib-fpm folder
3939
python config/fypp_deployment.py --deploy_stdlib_fpm
4040
41-
- run: | # Use fpm gnu ci to check xdp and qp
41+
- run: | # Use fpm gnu ci to check xdp and qp
4242
python config/fypp_deployment.py --with_xdp --with_qp
4343
fpm test --profile release --flag '-DWITH_XDP -DWITH_QP'
4444
45-
# Update and deploy the f90 files generated by github-ci to the `stdlib-fpm` branch.
45+
# Update and deploy the f90 files generated by github-ci to the `stdlib-fpm` branch.
4646
- name: Deploy 🚀
4747
uses: JamesIves/[email protected]
48-
if: github.event_name != 'pull_request'
4948
with:
5049
BRANCH: stdlib-fpm
51-
FOLDER: stdlib-fpm
50+
FOLDER: stdlib-fpm

0 commit comments

Comments
 (0)