Skip to content

Commit b67b5f2

Browse files
selmaVH1DelazJ
authored andcommitted
master branch preparation
1 parent 894e8be commit b67b5f2

5 files changed

Lines changed: 21 additions & 23 deletions

File tree

.github/dependabot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ updates:
1010
schedule:
1111
interval: "monthly"
1212
labels:
13-
- "backport release_3.40"
1413
- "backport release_3.44"
1514
- "dependencies"

.github/workflows/pofiles.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Update English PO files for translation
33
on:
44
push:
55
branches:
6-
- release_3.40
6+
- release_3.44
77
paths:
88
- 'docs/**'
99
- 'themes/**/*.html'
@@ -36,7 +36,7 @@ jobs:
3636
- name: checkout
3737
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3838
with:
39-
ref: release_3.40
39+
ref: release_3.44
4040

4141
- name: Set up Python 3.12
4242
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0

.github/workflows/pull_minimized_translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
env:
2121
# only pull to the branch we translate
22-
TARGET_BRANCH: "release_3.40"
22+
TARGET_BRANCH: "release_3.44"
2323

2424
steps:
2525
- name: Harden Runner

.github/workflows/translation_statistics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
env:
2424
TRANSIFEX_PASSWORD: ${{ secrets.TRANSIFEX_PASSWORD }}
2525
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26-
LABELS: "Translation, backport release_3.40, backport release_3.44"
26+
LABELS: "Translation, backport release_3.44"
2727

2828
steps:
2929
- name: Harden Runner

scripts/fix_versions.sh

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ set -e
99

1010
# The target deprecated versions to update, folders in site directory
1111
# List to complete
12-
DEPRECATED=(3.34 3.28 3.22 3.16 3.10 3.4)
12+
DEPRECATED=(3.40 3.34 3.28 3.22 3.16 3.10 3.4)
1313
# The versions to reference. List to complete
14-
DOCVERSIONS=(testing latest 3.40 3.34 3.28 3.22 3.16 3.10 3.4 2.18)
14+
DOCVERSIONS=(testing latest 3.44 3.40 3.34 3.28 3.22 3.16 3.10 3.4 2.18)
1515
# The main parent folder as a parameter, or use current folder (default value)
1616
SPATH=${1:-$PWD}
1717

@@ -21,29 +21,28 @@ export LC_ALL=en_US.UTF-8
2121

2222
function fix_versionsUrl {
2323

24-
for release in "${DEPRECATED[@]}"; do
24+
for release in "${DEPRECATED[@]}"; do
2525

26-
echo "Replacing urls in ${release} doc files..."
27-
for HTMLFILE in `find ${SPATH}/${release} -type f -name '*.html'`; do
26+
echo "Replacing urls in ${release} doc files..."
27+
for HTMLFILE in $(find ${SPATH}/${release} -type f -name '*.html'); do
2828

29-
# Identify the actual file in doc structure, removing the parent folders
30-
FILEURL="${HTMLFILE#${SPATH}/${release}/}"
29+
# Identify the actual file in doc structure, removing the parent folders
30+
FILEURL="${HTMLFILE#${SPATH}/${release}/}"
3131

32-
# Create the replacement lines
33-
for v in "${DOCVERSIONS[@]}"; do
34-
REPL="${REPL}\n \n <dd><a href=\"https://docs.qgis.org/${v}/${FILEURL}\">${v}</a></dd>"
35-
done
32+
# Create the replacement lines
33+
for v in "${DOCVERSIONS[@]}"; do
34+
REPL="${REPL}\n \n <dd><a href=\"https://docs.qgis.org/${v}/${FILEURL}\">${v}</a></dd>"
35+
done
3636

37-
# Do the replacement
38-
perl -i -p0e "s@<dl>(\s*)<dt>Versions</dt>.*</dl>@<dl>\1<dt>Versions</dt>${REPL}\n \n </dl>@smg" ${HTMLFILE};
37+
# Do the replacement
38+
perl -i -p0e "s@<dl>(\s*)<dt>Versions</dt>.*</dl>@<dl>\1<dt>Versions</dt>${REPL}\n \n </dl>@smg" ${HTMLFILE}
3939

40-
# let's clear the replacement variable
41-
unset REPL
40+
# let's clear the replacement variable
41+
unset REPL
4242

43+
done
44+
echo "Replacement of urls in ${release} doc files finished."
4345
done
44-
echo "Replacement of urls in ${release} doc files finished."
45-
done
4646
}
4747

4848
fix_versionsUrl ${SPATH}
49-

0 commit comments

Comments
 (0)