Skip to content

Commit 2197d9f

Browse files
authored
Apply fixes for YAML file formatting (#10915)
Backport #10901
2 parents 2e12d20 + f7f2ee7 commit 2197d9f

File tree

8 files changed

+271
-260
lines changed

8 files changed

+271
-260
lines changed

.github/workflows/builds.yml

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ concurrency:
44
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
55
cancel-in-progress: true
66

7-
on:
7+
on:
88
push:
99
paths-ignore:
1010
- 'locale/**'
@@ -25,50 +25,50 @@ jobs:
2525
format: [html, pdf]
2626

2727
steps:
28-
- name: Harden Runner
29-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
30-
with:
31-
egress-policy: block
32-
allowed-endpoints: >
33-
api.ipify.org:443
34-
archive.ubuntu.com:443
35-
azure.archive.ubuntu.com:80
36-
cdn.fwupd.org:443
37-
esm.ubuntu.com:443
38-
files.pythonhosted.org:443
39-
github.com:443
40-
motd.ubuntu.com:443
41-
motd.ubuntu.com:80
42-
packages.microsoft.com:443
43-
ppa.launchpadcontent.net:443
44-
pypi.org:443
45-
qgis.org:443
46-
raw.githubusercontent.com:443
47-
security.ubuntu.com:443
28+
- name: Harden Runner
29+
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
30+
with:
31+
egress-policy: block
32+
allowed-endpoints: >
33+
api.ipify.org:443
34+
archive.ubuntu.com:443
35+
azure.archive.ubuntu.com:80
36+
cdn.fwupd.org:443
37+
esm.ubuntu.com:443
38+
files.pythonhosted.org:443
39+
github.com:443
40+
motd.ubuntu.com:443
41+
motd.ubuntu.com:80
42+
packages.microsoft.com:443
43+
ppa.launchpadcontent.net:443
44+
pypi.org:443
45+
qgis.org:443
46+
raw.githubusercontent.com:443
47+
security.ubuntu.com:443
4848
49-
- name: Check out repository
50-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
51-
with:
52-
fetch-depth: 1
53-
- name: Set up Python 3.12
54-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
55-
with:
56-
python-version: '3.12'
57-
- name: Install Requirements
58-
run: |
59-
if [[ ${{ matrix.format }} != "html" ]]; then
60-
sudo apt-get update && sudo apt-get install -y texlive-xetex fonts-freefont-otf
61-
fi
49+
- name: Check out repository
50+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
51+
with:
52+
fetch-depth: 1
53+
- name: Set up Python 3.12
54+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
55+
with:
56+
python-version: '3.12'
57+
- name: Install Requirements
58+
run: |
59+
if [[ ${{ matrix.format }} != "html" ]]; then
60+
sudo apt-get update && sudo apt-get install -y texlive-xetex fonts-freefont-otf
61+
fi
6262
63-
python -m pip install --upgrade pip
64-
pip install -r REQUIREMENTS.txt
63+
python -m pip install --upgrade pip
64+
pip install -r REQUIREMENTS.txt
6565
66-
- name: Build English ${{ matrix.format }} documentation
67-
run: |
68-
make ${{ matrix.format }}
69-
- name: Upload ${{ matrix.format }} build artifact
70-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
71-
with:
72-
name: ${{ matrix.format }} build
73-
path: build/${{ matrix.format }}
74-
retention-days: 15
66+
- name: Build English ${{ matrix.format }} documentation
67+
run: |
68+
make ${{ matrix.format }}
69+
- name: Upload ${{ matrix.format }} build artifact
70+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
71+
with:
72+
name: ${{ matrix.format }} build
73+
path: build/${{ matrix.format }}
74+
retention-days: 15

.github/workflows/doctest.yml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,38 +26,38 @@ jobs:
2626
image: docker
2727

2828
steps:
29-
- name: Harden Runner
30-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
31-
with:
32-
disable-sudo: true
33-
egress-policy: block
34-
allowed-endpoints: >
35-
archive.ubuntu.com:80
36-
auth.docker.io:443
37-
demo.mapserver.org:443
38-
files.pythonhosted.org:443
39-
github.com:443
40-
production.cloudflare.docker.com:443
41-
pypi.org:443
42-
qgis.org:443
43-
raw.githubusercontent.com:443
44-
registry-1.docker.io:443
45-
46-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
47-
with:
48-
fetch-depth: 1
49-
- name: Set up Python 3.12
50-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
51-
with:
52-
python-version: '3.12'
53-
- name: Pip upgrade
54-
run: |
55-
python -m pip install --upgrade pip
56-
- name: Build test code
57-
run: |
58-
make -f docker.mk doctest
59-
- name: Upload build artifact
60-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
61-
with:
62-
name: Doctest build
63-
path: ./build/doctest/output.txt
29+
- name: Harden Runner
30+
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
31+
with:
32+
disable-sudo: true
33+
egress-policy: block
34+
allowed-endpoints: >
35+
archive.ubuntu.com:80
36+
auth.docker.io:443
37+
demo.mapserver.org:443
38+
files.pythonhosted.org:443
39+
github.com:443
40+
production.cloudflare.docker.com:443
41+
pypi.org:443
42+
qgis.org:443
43+
raw.githubusercontent.com:443
44+
registry-1.docker.io:443
45+
46+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
47+
with:
48+
fetch-depth: 1
49+
- name: Set up Python 3.12
50+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
51+
with:
52+
python-version: '3.12'
53+
- name: Pip upgrade
54+
run: |
55+
python -m pip install --upgrade pip
56+
- name: Build test code
57+
run: |
58+
make -f docker.mk doctest
59+
- name: Upload build artifact
60+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
61+
with:
62+
name: Doctest build
63+
path: ./build/doctest/output.txt

.github/workflows/pofiles.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,50 +22,50 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- name: Harden Runner
26-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
27-
with:
28-
disable-sudo-and-containers: true
29-
egress-policy: block
30-
allowed-endpoints: >
31-
files.pythonhosted.org:443
32-
github.com:443
33-
pypi.org:443
34-
qgis.org:443
25+
- name: Harden Runner
26+
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
27+
with:
28+
disable-sudo-and-containers: true
29+
egress-policy: block
30+
allowed-endpoints: >
31+
files.pythonhosted.org:443
32+
github.com:443
33+
pypi.org:443
34+
qgis.org:443
3535
36-
- name: checkout
37-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
38-
with:
39-
ref: release_3.44
36+
- name: checkout
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
38+
with:
39+
ref: release_3.44
4040

41-
- name: Set up Python 3.12
42-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
43-
with:
44-
python-version: '3.12'
41+
- name: Set up Python 3.12
42+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
43+
with:
44+
python-version: '3.12'
4545

46-
- name: Install dependencies
47-
run: |
46+
- name: Install dependencies
47+
run: |
4848
python -m pip install --upgrade pip
4949
pip install -r REQUIREMENTS.txt
5050
51-
- name: Generate English PO files
52-
id: "generate-po-files"
53-
run: |
51+
- name: Generate English PO files
52+
id: "generate-po-files"
53+
run: |
5454
make gettext
5555
sphinx-intl update -p build/gettext -l en
5656
# Remove obsolete strings from the generated *.po files
5757
find locale/en/LC_MESSAGES/ -type f -name '*.po' -exec sed -i '/^#~ /,/^$/d' {} \;
5858
59-
- name: Commit the changes in the PO files
60-
id: "auto-commit-action"
61-
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
62-
with:
63-
commit_message: Update English PO files
59+
- name: Commit the changes in the PO files
60+
id: "auto-commit-action"
61+
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
62+
with:
63+
commit_message: Update English PO files
6464

65-
- name: "Inform that changes have been made"
66-
if: steps.auto-commit-action.outputs.changes_detected == 'true'
67-
run: echo "Changes committed!"
65+
- name: "Inform that changes have been made"
66+
if: steps.auto-commit-action.outputs.changes_detected == 'true'
67+
run: echo "Changes committed!"
6868

69-
- name: "Inform that no changes were performed"
70-
if: steps.auto-commit-action.outputs.changes_detected == 'false'
71-
run: echo "No Changes detected!"
69+
- name: "Inform that no changes were performed"
70+
if: steps.auto-commit-action.outputs.changes_detected == 'false'
71+
run: echo "No Changes detected!"

.github/workflows/pull_minimized_translations.yml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -22,57 +22,57 @@ jobs:
2222
TARGET_BRANCH: "release_3.44"
2323

2424
steps:
25-
- name: Harden Runner
26-
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
27-
with:
28-
egress-policy: block
29-
allowed-endpoints: >
30-
api.ipify.org:443
31-
github.com:443
32-
objects.githubusercontent.com:443
33-
raw.githubusercontent.com:443
34-
rest.api.transifex.com:443
35-
storage.svc.transifex.net:443
36-
release-assets.githubusercontent.com:443
25+
- name: Harden Runner
26+
uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
27+
with:
28+
egress-policy: block
29+
allowed-endpoints: >
30+
api.ipify.org:443
31+
github.com:443
32+
objects.githubusercontent.com:443
33+
raw.githubusercontent.com:443
34+
rest.api.transifex.com:443
35+
storage.svc.transifex.net:443
36+
release-assets.githubusercontent.com:443
3737
38-
- name: Check out repository
39-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
40-
with:
41-
fetch-depth: 1
42-
ref: ${{ env.TARGET_BRANCH }}
38+
- name: Check out repository
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
40+
with:
41+
fetch-depth: 1
42+
ref: ${{ env.TARGET_BRANCH }}
4343

44-
- name: Install Transifex client
45-
run: |
46-
curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
47-
mv tx LICENSE -t /usr/local/bin/
44+
- name: Install Transifex client
45+
run: |
46+
curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
47+
mv tx LICENSE -t /usr/local/bin/
4848
49-
- shell: bash
50-
name: create .transifexrc file
51-
env:
52-
TRANSIFEX_PASSWORD: ${{ secrets.TRANSIFEX_PASSWORD }}
53-
run: |
54-
sudo echo -e "[https://app.transifex.com]\nrest_hostname = https://rest.api.transifex.com\ntoken = $TRANSIFEX_PASSWORD" > ~/.transifexrc
49+
- shell: bash
50+
name: create .transifexrc file
51+
env:
52+
TRANSIFEX_PASSWORD: ${{ secrets.TRANSIFEX_PASSWORD }}
53+
run: |
54+
sudo echo -e "[https://app.transifex.com]\nrest_hostname = https://rest.api.transifex.com\ntoken = $TRANSIFEX_PASSWORD" > ~/.transifexrc
5555
56-
- name: Download and sanitize files and folders
57-
run: bash ./scripts/minimize_translation.sh
56+
- name: Download and sanitize files and folders
57+
run: bash ./scripts/minimize_translation.sh
5858

59-
# - name: Show changes
60-
# run: echo `git status`
59+
# - name: Show changes
60+
# run: echo `git status`
6161

62-
- name: Load translations if any
63-
run: |
64-
git config --global user.name 'Transifex update'
65-
git config --global user.email 'tx-update@users.noreply.github.com'
66-
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
67-
if git add locale/* && git commit -m "Loading new translations"; then
68-
git push
69-
else
70-
echo "No new translations"
71-
fi
62+
- name: Load translations if any
63+
run: |
64+
git config --global user.name 'Transifex update'
65+
git config --global user.email 'tx-update@users.noreply.github.com'
66+
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
67+
if git add locale/* && git commit -m "Loading new translations"; then
68+
git push
69+
else
70+
echo "No new translations"
71+
fi
7272
7373
74-
# - name: Pull source file using transifex client
75-
# uses: transifex/cli-action@bc67c0ab1369ef941f0963d902c45d11688c8bc9 # v1
76-
# with:
77-
# token: ${{ secrets.TRANSIFEX_PASSWORD }}
78-
# args: pull --force --mode onlytranslated -l fr
74+
# - name: Pull source file using transifex client
75+
# uses: transifex/cli-action@bc67c0ab1369ef941f0963d902c45d11688c8bc9 # v1
76+
# with:
77+
# token: ${{ secrets.TRANSIFEX_PASSWORD }}
78+
# args: pull --force --mode onlytranslated -l fr

0 commit comments

Comments
 (0)