Skip to content

Commit 832f43b

Browse files
authored
Merge branch 'master' into article/mise-en-place-nextcloud
2 parents a3bd845 + ede7ee1 commit 832f43b

33 files changed

+1191
-106
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Get source code
42-
uses: actions/checkout@v5
42+
uses: actions/checkout@v6
4343
with:
4444
fetch-depth: 0
4545

@@ -55,7 +55,7 @@ jobs:
5555
python -m pip install --upgrade -r requirements.txt
5656
5757
- name: Cache build dependencies (external assets downloaded)
58-
uses: actions/cache@v4
58+
uses: actions/cache@v5
5959
with:
6060
key: ${{ github.ref }}
6161
path: .cache

.github/workflows/issue_comment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919

2020
- name: Set up Python
2121
uses: actions/setup-python@v6
@@ -37,7 +37,7 @@ jobs:
3737
JSON_STRING: ${{ steps.issue-parser.outputs.jsonString }}
3838

3939
- name: Save form output as artifact
40-
uses: actions/upload-artifact@v5
40+
uses: actions/upload-artifact@v6
4141
with:
4242
name: input_form.json
4343
path: "rdp*.json"
@@ -56,7 +56,7 @@ jobs:
5656
run: python scripts/issue_comment_templater_rdp.py
5757

5858
- name: Save comment artifact
59-
uses: actions/upload-artifact@v5
59+
uses: actions/upload-artifact@v6
6060
with:
6161
name: output_comment.md
6262
overwrite: true

.github/workflows/links_checker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Get source code
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626

2727
- name: Set up Python
2828
uses: actions/setup-python@v6
@@ -53,7 +53,7 @@ jobs:
5353
> linkchecker_report.html
5454
5555
- name: Save report output as artifact
56-
uses: actions/upload-artifact@v5
56+
uses: actions/upload-artifact@v6
5757
if: ${{ always() }}
5858
continue-on-error: true
5959
with:

.github/workflows/manual_new_rdp.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ on:
77
type: string
88
description: Date de la prochaine RDP au format YYYY-MM-DD
99
required: true
10-
notify-slack:
11-
type: boolean
12-
default: true
13-
description: Notifier l'équipe sur Slack
14-
required: false
1510
notify-matrix:
1611
type: boolean
1712
default: true
@@ -39,7 +34,7 @@ jobs:
3934
echo "DATE_FR_LONG=$(date -d ${{ github.event.inputs.date }} '+%-d %B %Y')" >> $GITHUB_ENV
4035
4136
- name: Get source code
42-
uses: actions/checkout@v5
37+
uses: actions/checkout@v6
4338

4439
- name: Create a new GeoRDP
4540
shell: bash
@@ -71,15 +66,6 @@ jobs:
7166
pr_title: "🗞 GeoRDP du ${{ env.DATE_FR_LONG }}"
7267
pr_template: .github/PULL_REQUEST_TEMPLATE.md
7368

74-
- name: Notification Slack
75-
id: slack
76-
uses: slackapi/[email protected]
77-
if: "${{ github.event.inputs.notify-slack == 'true' }}"
78-
with:
79-
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
80-
webhook-type: incoming-webhook
81-
payload: '{"blocks":[{"type":"section","text":{"type":"mrkdwn","text":":newspaper: La GeoRDP du ${{ env.DATE_FR_LONG }} a été créée et attend vos contributions :writing_hand: !"}},{"type":"section","fields":[{"type":"mrkdwn","text":"Créée par *${{ github.actor }}* via GitHub Action."}]},{"type":"actions","elements":[{"type":"button","text":{"type":"plain_text","emoji":true,"text":":squid: Voir la PR (GitHub)"},"url":"${{ steps.cpr.outputs.pr_url }}"},{"type":"button","text":{"type":"plain_text","emoji":true,"text":":eye: Voir la preview (Netlify)"},"style":"primary","url":"https://preview-pullrequest-${{steps.cpr.outputs.pr_number}}--geotribu-preprod.netlify.app/"}]}]}'
82-
8369
- name: Notification matrix
8470
id: matrix-notification
8571
uses: fadenb/[email protected]
@@ -89,7 +75,7 @@ jobs:
8975
token: ${{ secrets.MATRIX_TOKEN }}
9076
channel: ${{ secrets.MATRIX_CHANNEL }}
9177
message: |
92-
📰 La GeoRDP du **${{ env.DATE_FR_LONG }}** a été créée et attend vos contributions ✍️ !
93-
Créée par **${{ github.actor }}** via GitHub Action.
94-
[Voir la PR (GitHub)](${{ steps.cpr.outputs.pr_url }})
95-
[Voir la preview (Netlify)](https://preview-pullrequest-${{steps.cpr.outputs.pr_number}}--geotribu-preprod.netlify.app/)
78+
📰 La GeoRDP du **${{ env.DATE_FR_LONG }}** a été créée et attend vos contributions ✍️ !\
79+
Créée par ${{ github.actor }} via GitHub Action.
80+
- Voir la PR (GitHub): ${{ steps.cpr.outputs.pr_url }}
81+
- Voir la preview (Netlify): https://preview-pullrequest-${{steps.cpr.outputs.pr_number}}--geotribu-preprod.netlify.app/

.github/workflows/pr_checker_build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Get source code
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535

3636
- name: Set up Python
3737
uses: actions/setup-python@v6
@@ -46,7 +46,7 @@ jobs:
4646
python -m pip install -U -r requirements.txt
4747
4848
- name: Cache build dependencies (external assets downloaded)
49-
uses: actions/cache@v4
49+
uses: actions/cache@v5
5050
with:
5151
key: ${{ github.ref }}
5252
path: .cache
@@ -103,7 +103,7 @@ jobs:
103103
tar --zstd -cf artifact.tar.zst pr.env ${{ env.BUILD_DIR }}
104104
105105
- name: Save build website as artifact
106-
uses: actions/upload-artifact@v5
106+
uses: actions/upload-artifact@v6
107107
with:
108108
name: pr-build-website
109109
path: artifact.tar.zst

.github/workflows/pr_cleaner_post_merge.yml

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

2121
steps:
2222
- name: Get source code
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v6
2424

2525
- name: Prepare redirection
2626
run: |

.github/workflows/pr_header_check.yml

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

1414
steps:
1515
- name: "Fetch source code"
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717

1818
- name: "Set up Python"
1919
uses: actions/setup-python@v6

.github/workflows/pr_linter_markdown.yml

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

2222
steps:
2323
- name: "Récupère le code source"
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@v6
2525

2626
# Filter results by added/modified lines.
2727
- name: "Vérifie la syntaxe des lignes ajoutées ou modifiées"

.github/workflows/pr_preview_netlify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# =============================== #
2626

2727
- name: Download artifact from build workflow
28-
uses: dawidd6/action-download-artifact@v11
28+
uses: dawidd6/action-download-artifact@v12
2929
with:
3030
github_token: ${{ secrets.GITHUB_TOKEN }}
3131
name: pr-build-website

.mailmap

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ David Michallet <[email protected]>
1919
Delphine Montagne <[email protected]>
2020
2121
22+
2223

2324
Étienne Delay <[email protected]>
2425

@@ -55,7 +56,8 @@ Guilhem Allaman <[email protected]> <[email protected]>
5556
Humbert Fiorino <[email protected]>
5657
5758

58-
Jean-Baptiste Desbas <[email protected]>
59+
Jean-Baptiste Desbas <[email protected]>
60+
Jean-Baptiste Desbas <[email protected]> <[email protected]>
5961

6062
Jean-Marc Viglino <[email protected]>
6163

@@ -85,6 +87,8 @@ Loïc Bartoletti <[email protected]> <[email protected]
8587
8688
8789

90+
Loïc Moisan <[email protected]>
91+
8892
Maël Reboux <[email protected]>
8993
9094

@@ -115,6 +119,8 @@ Olivia Guyot <[email protected]>
115119

116120
Patrick Gendre <[email protected]>
117121

122+
Paul Blottiere <[email protected]>
123+
118124
Pierre Vernier <[email protected]>
119125
120126

@@ -140,6 +146,7 @@ Stéphane Mével-Viannay <[email protected]>
140146
Stéphane Ritzenthaler <[email protected]>
141147

142148
Stéphane Rolle <[email protected]>
149+
143150

144151
Sylvain Kerdreux <[email protected]>
145152

0 commit comments

Comments
 (0)