Skip to content

Commit 2415cc9

Browse files
authored
Merge branch 'main' into develop
2 parents a455d67 + 4d018dc commit 2415cc9

2 files changed

Lines changed: 16 additions & 22 deletions

File tree

.github/workflows/check-cr-approved.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
REPO: ${{ github.repository }}
1919
GH_TOKEN: ${{ github.token }}
2020
run: |
21+
echo "Running on PR #$PR_NUMBER in Repository $REPO"
22+
2123
# -- 1. Extract the assigned Code Reviewer from the PR body
2224
CODE_REVIEWER=$(echo "$PR_BODY" | grep -oP "Code Reviewer:\s?@\K([a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38})") || true
2325

.github/workflows/fortran-lint.yaml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# under which the code may be used.
55
# ------------------------------------------------------------------------------
66

7-
name: Fortran lint
7+
name: Lint
88
on:
99
workflow_call:
1010
inputs:
@@ -25,34 +25,26 @@ on:
2525
default: "3.14"
2626

2727
jobs:
28-
fortitude-linting:
29-
name: Fortran lint
28+
fortran-linting:
29+
name: Fortran
3030
runs-on: ${{ inputs.runner }}
3131
timeout-minutes: ${{ inputs.timeout }}
32+
33+
env:
34+
UV_PYTHON: ${{ inputs.python-version }}
35+
3236
steps:
3337
- name: Checkout repository
3438
uses: actions/checkout@v5
3539

36-
- name: Set up Python
37-
uses: actions/setup-python@v6
40+
- name: Setup uv and Python ${{ env.UV_PYTHON }}
41+
uses: astral-sh/setup-uv@v7
3842
with:
39-
python-version: ${{ inputs.python-version }}
40-
41-
- name: Cache pip packages
42-
uses: actions/cache@v4
43-
with:
44-
path: ~/.cache/pip
45-
key: ${{ runner.os }}-pip-${{ inputs.python-version }}
46-
restore-keys: |
47-
${{ runner.os }}-pip-
48-
49-
- name: minimize pip cache
50-
run: python -m pip cache purge || true
43+
python-version: ${{ env.UV_PYTHON }}
44+
enable-cache: false
5145

52-
- name: Install Fortitude Linter
53-
run: |
54-
python -m pip install --upgrade pip
55-
python -m pip install fortitude-lint==0.7.3
46+
- name: Install fortitude-lint
47+
run: uv pip install fortitude-lint==0.7.3
5648

5749
- name: Run Fortitude Linter
58-
run: fortitude check --respect-gitignore --show-fixes --file-extensions=f90,F90,x90,X90 .
50+
run: uv run fortitude check --respect-gitignore --show-fixes --file-extensions=f90,F90,x90,X90,t90,T90,pf .

0 commit comments

Comments
 (0)