Skip to content

Commit 1ec7ebd

Browse files
echoixechoix
authored
chore: Format yaml and workflow files (#5543)
1 parent 9e8870f commit 1ec7ebd

15 files changed

+142
-140
lines changed

‎.github/codeql/codeql-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: CodeQL config
33
paths-ignore:
4-
- '**/testsuite/**'
4+
- "**/testsuite/**"
55
- bin.*
66
- dist.*
77
- node_modules

‎.github/labeler.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ database:
2727
- db/**
2828
- lib/db/**
2929
- scripts/db.*/**
30-
- '**.sql'
30+
- "**.sql"
3131
display:
3232
- changed-files:
3333
- any-glob-to-any-file:
@@ -123,8 +123,8 @@ docker:
123123
- changed-files:
124124
- any-glob-to-any-file:
125125
- docker/**
126-
- '**/*Dockerfile*'
127-
- '**/*dockerfile*'
126+
- "**/*Dockerfile*"
127+
- "**/*dockerfile*"
128128
- .dockerignore
129129
nix:
130130
- changed-files:
@@ -140,17 +140,17 @@ docs:
140140
- any-glob-to-any-file:
141141
- doc/**
142142
- man/**
143-
- '**/*.md'
144-
- '**/*.rst'
145-
- '**/*.html'
146-
- '**/*.dox'
147-
- '**/*.png'
148-
- '**.cff'
143+
- "**/*.md"
144+
- "**/*.rst"
145+
- "**/*.html"
146+
- "**/*.dox"
147+
- "**/*.png"
148+
- "**.cff"
149149
- CITING
150150
- AUTHORS
151151
- TODO
152152
- all-globs-to-all-files:
153-
- '!doc/development/rfc/**'
153+
- "!doc/development/rfc/**"
154154
RFC:
155155
- changed-files:
156156
- any-glob-to-any-file:
@@ -163,29 +163,29 @@ translation:
163163
Python:
164164
- changed-files:
165165
- any-glob-to-any-file:
166-
- '**/*.py'
167-
- '**/pyproject.toml'
166+
- "**/*.py"
167+
- "**/pyproject.toml"
168168
notebook:
169169
- changed-files:
170170
- any-glob-to-any-file:
171-
- '**/*.ipynb'
171+
- "**/*.ipynb"
172172
- doc/examples/notebooks/**
173173
- python/grass/jupyter/**
174174
C:
175175
- changed-files:
176-
- any-glob-to-any-file: '**/*.c'
176+
- any-glob-to-any-file: "**/*.c"
177177
C++:
178178
- changed-files:
179-
- any-glob-to-any-file: '**/*.cpp'
179+
- any-glob-to-any-file: "**/*.cpp"
180180
CSS:
181181
- changed-files:
182-
- any-glob-to-any-file: '**/*.css'
182+
- any-glob-to-any-file: "**/*.css"
183183
HTML:
184184
- changed-files:
185-
- any-glob-to-any-file: '**/*.html'
185+
- any-glob-to-any-file: "**/*.html"
186186
JavaScript:
187187
- changed-files:
188-
- any-glob-to-any-file: '**/*.js'
188+
- any-glob-to-any-file: "**/*.js"
189189
markdown:
190190
- changed-files:
191191
- any-glob-to-any-file:

‎.github/workflows/additional_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Set up Python
5454
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
5555
with:
56-
python-version: '3.13'
56+
python-version: "3.13"
5757

5858
- name: Check that files with the same content are the same
5959
run: |

‎.github/workflows/cmake.yml

Lines changed: 79 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -2,91 +2,90 @@
22
name: CMake
33

44
on:
5-
push:
6-
paths-ignore:
7-
- 'doc/**'
8-
branches:
9-
- main
10-
- releasebranch_*
11-
pull_request:
12-
paths-ignore:
13-
- 'doc/**'
5+
push:
6+
paths-ignore:
7+
- "doc/**"
8+
branches:
9+
- main
10+
- releasebranch_*
11+
pull_request:
12+
paths-ignore:
13+
- "doc/**"
1414

1515
concurrency:
16-
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
17-
cancel-in-progress: true
16+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
17+
cancel-in-progress: true
1818

1919
env:
20-
CMAKE_UNITY_BUILD: OFF
20+
CMAKE_UNITY_BUILD: OFF
2121

2222
permissions:
23-
contents: read
23+
contents: read
2424

2525
jobs:
26-
27-
build-cmake:
28-
runs-on: ubuntu-22.04
29-
env:
30-
CMakeVersion: "3.22.0"
31-
steps:
32-
- name: Checkout GRASS
33-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34-
- name: Install CMake
35-
run: |
36-
cd ${GITHUB_WORKSPACE}
37-
arch=$(echo $(uname -s)-$(uname -m) | awk '{print tolower($0)}')
38-
v=v${{ env.CMakeVersion }}/cmake-${{ env.CMakeVersion }}-${arch}.tar.gz
39-
wget https://github.com/Kitware/CMake/releases/download/$v
40-
tar xzf cmake-${{ env.CMakeVersion }}-${arch}.tar.gz
41-
echo "CMAKE_DIR=$GITHUB_WORKSPACE/cmake-${{ env.CMakeVersion }}-${arch}/bin" >> $GITHUB_ENV
42-
echo "$GITHUB_WORKSPACE/cmake-${{ env.CMakeVersion }}-${arch}/bin" >> $GITHUB_PATH
43-
- run: |
44-
cmake --version
45-
- name: Install dependencies
46-
run: |
47-
sudo apt-get update -y
48-
sudo apt-get install -y wget git gawk findutils ninja-build libpq-dev \
49-
gettext unixodbc-dev libnetcdf-dev
50-
xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
51-
sudo apt-get install -y --no-install-recommends --no-install-suggests
52-
- name: Print build environment variables
53-
shell: bash -el {0}
54-
run: |
55-
printenv | sort
56-
gcc --version
57-
ldd --version
58-
- name: Create installation directory
59-
run: |
60-
mkdir $HOME/install
61-
- name: Configure
62-
run: |
63-
cmake ${CMAKE_OPTIONS} -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -G Ninja \
64-
-DCMAKE_INSTALL_PREFIX=$HOME/install -DWITH_NLS=ON -DWITH_GUI=OFF -DWITH_DOCS=OFF \
65-
-DWITH_READLINE=ON -DWITH_ODBC=ON -DWITH_NETCDF=ON -DWITH_BZLIB=ON
66-
- name: Print CMakeCache.txt
67-
shell: bash -el {0}
68-
run: |
69-
cat ${GITHUB_WORKSPACE}/build/CMakeCache.txt
70-
- name: Build
71-
run: |
72-
cmake --build build --verbose -j$(nproc)
73-
- name: Install
74-
run: |
75-
cmake --install $GITHUB_WORKSPACE/build --verbose
76-
- name: Add the bin directory to PATH
77-
run: |
78-
echo "$HOME/install/bin" >> $GITHUB_PATH
79-
- name: Print installed versions
80-
if: always()
81-
run: .github/workflows/print_versions.sh
82-
- name: Test executing of the grass command
83-
run: .github/workflows/test_simple.sh
84-
- name: Run tests
85-
run: .github/workflows/test_thorough.sh --config .gunittest.cfg --min-success 98
86-
- name: Make HTML test report available
87-
if: ${{ !cancelled() }}
88-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
89-
with:
90-
name: testreport-CMake
91-
path: testreport
92-
retention-days: 3
26+
build-cmake:
27+
runs-on: ubuntu-22.04
28+
env:
29+
CMakeVersion: "3.22.0"
30+
steps:
31+
- name: Checkout GRASS
32+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
- name: Install CMake
34+
run: |
35+
cd ${GITHUB_WORKSPACE}
36+
arch=$(echo $(uname -s)-$(uname -m) | awk '{print tolower($0)}')
37+
v=v${{ env.CMakeVersion }}/cmake-${{ env.CMakeVersion }}-${arch}.tar.gz
38+
wget https://github.com/Kitware/CMake/releases/download/$v
39+
tar xzf cmake-${{ env.CMakeVersion }}-${arch}.tar.gz
40+
echo "CMAKE_DIR=$GITHUB_WORKSPACE/cmake-${{ env.CMakeVersion }}-${arch}/bin" >> $GITHUB_ENV
41+
echo "$GITHUB_WORKSPACE/cmake-${{ env.CMakeVersion }}-${arch}/bin" >> $GITHUB_PATH
42+
- run: |
43+
cmake --version
44+
- name: Install dependencies
45+
run: |
46+
sudo apt-get update -y
47+
sudo apt-get install -y wget git gawk findutils ninja-build libpq-dev \
48+
gettext unixodbc-dev libnetcdf-dev
49+
xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
50+
sudo apt-get install -y --no-install-recommends --no-install-suggests
51+
- name: Print build environment variables
52+
shell: bash -el {0}
53+
run: |
54+
printenv | sort
55+
gcc --version
56+
ldd --version
57+
- name: Create installation directory
58+
run: |
59+
mkdir $HOME/install
60+
- name: Configure
61+
run: |
62+
cmake ${CMAKE_OPTIONS} -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -G Ninja \
63+
-DCMAKE_INSTALL_PREFIX=$HOME/install -DWITH_NLS=ON -DWITH_GUI=OFF -DWITH_DOCS=OFF \
64+
-DWITH_READLINE=ON -DWITH_ODBC=ON -DWITH_NETCDF=ON -DWITH_BZLIB=ON
65+
- name: Print CMakeCache.txt
66+
shell: bash -el {0}
67+
run: |
68+
cat ${GITHUB_WORKSPACE}/build/CMakeCache.txt
69+
- name: Build
70+
run: |
71+
cmake --build build --verbose -j$(nproc)
72+
- name: Install
73+
run: |
74+
cmake --install $GITHUB_WORKSPACE/build --verbose
75+
- name: Add the bin directory to PATH
76+
run: |
77+
echo "$HOME/install/bin" >> $GITHUB_PATH
78+
- name: Print installed versions
79+
if: always()
80+
run: .github/workflows/print_versions.sh
81+
- name: Test executing of the grass command
82+
run: .github/workflows/test_simple.sh
83+
- name: Run tests
84+
run: .github/workflows/test_thorough.sh --config .gunittest.cfg --min-success 98
85+
- name: Make HTML test report available
86+
if: ${{ !cancelled() }}
87+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
88+
with:
89+
name: testreport-CMake
90+
path: testreport
91+
retention-days: 3

‎.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ on:
77
- main
88
pull_request:
99
paths-ignore:
10-
- '**/*.html'
11-
- '**/*.md'
12-
- '**/*.txt'
10+
- "**/*.html"
11+
- "**/*.md"
12+
- "**/*.txt"
1313
schedule:
1414
# Check every Saturday at 18:36
1515
- cron: 36 18 * * 6
@@ -45,7 +45,7 @@ jobs:
4545
- name: Set up Python
4646
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
4747
with:
48-
python-version: '3.x'
48+
python-version: "3.x"
4949
- name: Install non-Python dependencies
5050
if: ${{ matrix.language == 'c-cpp' }}
5151
run: |

‎.github/workflows/gcc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ jobs:
1515
name: ${{ matrix.c }} & ${{ matrix.cpp }}
1616

1717
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
18+
group: >-
19+
${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
1920
matrix.c }}-${{ matrix.cpp }}
2021
cancel-in-progress: true
2122

‎.github/workflows/macos_distribute_app.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- cron: "30 7 * * THU"
1212
push:
1313
tags:
14-
- '**'
14+
- "**"
1515

1616
permissions: {}
1717

@@ -24,7 +24,8 @@ jobs:
2424
if: ${{ github.repository == 'OSGeo/grass' }}
2525

2626
concurrency:
27-
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
27+
group: >-
28+
${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
2829
matrix.name }}-${{ matrix.os }}
2930
cancel-in-progress: true
3031

‎.github/workflows/osgeo4w.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ jobs:
1515
name: ${{ matrix.os }} build and tests
1616

1717
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
18+
group: >-
19+
${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
1920
matrix.os }}
2021
cancel-in-progress: true
2122

‎.github/workflows/pytest.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ permissions: {}
1313
jobs:
1414
pytest:
1515
concurrency:
16-
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
16+
group: >-
17+
${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
1718
matrix.os }}-${{ matrix.python-version }}
1819
cancel-in-progress: true
1920

@@ -22,9 +23,9 @@ jobs:
2223
os:
2324
- ubuntu-22.04
2425
python-version:
25-
- '3.9'
26-
- '3.12'
27-
- '3.13'
26+
- "3.9"
27+
- "3.12"
28+
- "3.13"
2829
fail-fast: true
2930

3031
runs-on: ${{ matrix.os }}

‎.github/workflows/test-nix.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ name: Nix package and environment
33

44
on:
55
schedule:
6-
- cron: '0 1 * * 1'
6+
- cron: "0 1 * * 1"
77
push:
88
tags:
9-
- '*'
9+
- "*"
1010
pull_request:
1111
paths:
12-
- 'flake.nix'
13-
- 'flake.lock'
14-
- 'package.nix'
15-
- '.github/workflows/test-nix.yml'
12+
- ".github/workflows/test-nix.yml"
13+
- "flake.lock"
14+
- "flake.nix"
15+
- "package.nix"
1616
workflow_dispatch:
1717

1818
concurrency:
@@ -37,7 +37,7 @@ jobs:
3737
uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
3838
with:
3939
name: osgeo-grass
40-
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
40+
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
4141

4242
- name: Build package
4343
run: nix build -L --accept-flake-config .#grass

‎.github/workflows/ubuntu.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ permissions: {}
1515
jobs:
1616
ubuntu:
1717
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
18+
group: >-
19+
${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
1920
matrix.name }}-${{ matrix.os }}-${{ matrix.extra-include }}
2021
cancel-in-progress: true
2122

0 commit comments

Comments
 (0)