Skip to content

Commit 4c9cd46

Browse files
authored
Merge branch 'OSGeo:main' into main
2 parents 4c7503d + 587b520 commit 4c9cd46

File tree

154 files changed

+6206
-4855
lines changed

Some content is hidden

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

154 files changed

+6206
-4855
lines changed

.github/actions/create-upload-suggestions/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ runs:
179179
echo "diff-file-name=${INPUT_DIFF_FILE_NAME}" >> "${GITHUB_OUTPUT}"
180180
env:
181181
INPUT_DIFF_FILE_NAME: ${{ steps.tool-name-safe.outputs.diff-file-name }}
182-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
182+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
183183
id: upload-diff
184184
if: >-
185185
${{ (steps.files_changed.outputs.files_changed == 'true') &&
@@ -202,7 +202,7 @@ runs:
202202
echo 'Suggestions can only be added near to lines changed in this PR.'
203203
echo 'If any fixes can be added as code suggestions, they will be added shortly from another workflow.'
204204
} >> "${GITHUB_STEP_SUMMARY}"
205-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
205+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
206206
id: upload-changes
207207
if: >-
208208
${{ always() &&

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
run: .github/workflows/test_thorough.sh --config .gunittest.cfg --min-success 98
8989
- name: Make HTML test report available
9090
if: ${{ !cancelled() }}
91-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
91+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
9292
with:
9393
name: testreport-CMake
9494
path: testreport

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
if: ${{ matrix.language == 'c-cpp' }}
6565

6666
- name: Initialize CodeQL
67-
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
67+
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
6868
with:
6969
languages: ${{ matrix.language }}
7070
config-file: ./.github/codeql/codeql-config.yml
@@ -90,6 +90,6 @@ jobs:
9090
run: .github/workflows/build_ubuntu-24.04.sh "${HOME}/install"
9191

9292
- name: Perform CodeQL Analysis
93-
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
93+
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
9494
with:
9595
category: "/language:${{matrix.language}}"

.github/workflows/documentation.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
make htmldocs
161161
162162
- name: Make the doxygen results available (html)
163-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
163+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
164164
with:
165165
name: doxygen-site
166166
if-no-files-found: error
@@ -171,7 +171,7 @@ jobs:
171171
retention-days: 3
172172

173173
- name: Make the doxygen results available (latex)
174-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
174+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
175175
with:
176176
name: doxygen-site-latex
177177
if-no-files-found: error
@@ -251,15 +251,15 @@ jobs:
251251
--version "${VERSION}" -o
252252
253253
- name: Make logs available
254-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
254+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
255255
with:
256256
name: grass-addon-build-logs
257257
if-no-files-found: error
258258
path: addons-build-dir/logs
259259
retention-days: 3
260260

261261
- name: Make the result available
262-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
262+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
263263
with:
264264
name: mkdocs-site
265265
if-no-files-found: error

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168

169169
- name: Make HTML test report available
170170
if: ${{ !cancelled() }}
171-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
171+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
172172
with:
173173
name: testreport-macOS
174174
path: testreport

.github/workflows/macos_distribute_app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
131131
- name: Upload DMG file as artifact
132132
if: ${{ success() && !cancelled() }}
133-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
133+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
134134
with:
135135
name: ${{ env.DMG_NAME }}
136136
path: ${{ env.DMG_FILE }}

.github/workflows/osgeo4w.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166

167167
- name: Make HTML test report available
168168
if: ${{ always() }}
169-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
169+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
170170
with:
171171
name: testreport-${{ matrix.os }}
172172
path: testreport

.github/workflows/post-pr-reviews.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- name: Create a .git directory needed by reviewdog
2222
run: git init
23-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
23+
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
2424
id: diff
2525
continue-on-error: true
2626
with:

.github/workflows/pytest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
token: ${{ secrets.CODECOV_TOKEN }}
167167
- name: Make python-only code coverage test report available
168168
if: ${{ !cancelled() }}
169-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
169+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
170170
with:
171171
name: python-codecoverage-report-${{ matrix.os }}-${{ matrix.python-version }}
172172
path: coverage_html_report

.github/workflows/python-code-quality.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
# renovate: datasource=pypi depName=flake8
3333
FLAKE8_VERSION: "7.3.0"
3434
# renovate: datasource=pypi depName=pylint
35-
PYLINT_VERSION: "4.0.1"
35+
PYLINT_VERSION: "4.0.2"
3636
# renovate: datasource=pypi depName=bandit
3737
BANDIT_VERSION: "1.8.6"
3838
# renovate: datasource=pypi depName=ruff
39-
RUFF_VERSION: "0.14.1"
39+
RUFF_VERSION: "0.14.2"
4040

4141
runs-on: ${{ matrix.os }}
4242
permissions:
@@ -127,13 +127,13 @@ jobs:
127127
bandit -c pyproject.toml -iii -r . -f sarif -o bandit.sarif --exit-zero
128128
129129
- name: Upload Bandit Scan Results
130-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
130+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
131131
with:
132132
name: bandit.sarif
133133
path: bandit.sarif
134134

135135
- name: Upload SARIF File into Security Tab
136-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
136+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
137137
with:
138138
sarif_file: bandit.sarif
139139

0 commit comments

Comments
 (0)