Skip to content

Commit

Permalink
Prepare branch for releasing 3.34 as LTR
Browse files Browse the repository at this point in the history
  • Loading branch information
DelazJ committed Mar 2, 2024
1 parent 1df3299 commit 6946583
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pofiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Update English PO files for translation
on:
push:
branches:
- release_3.28
- release_3.34
paths:
- 'docs/**'

Expand All @@ -29,12 +29,12 @@ jobs:
- name: checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: release_3.28
ref: release_3.34

- name: Set up Python 3.9
- name: Set up Python 3.11
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
with:
python-version: 3.9
python-version: '3.11'

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_minimized_translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
env:
# only pull to the branch we translate
TARGET_BRANCH: "release_3.28"
TARGET_BRANCH: "release_3.34"

steps:
- name: Harden Runner
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/translation_statistics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
env:
TRANSIFEX_PASSWORD: ${{ secrets.TRANSIFEX_PASSWORD }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LABELS: "Translation, backport release_3.28, backport release_3.34"
LABELS: "Translation, backport release_3.34"

steps:
- name: Harden Runner
Expand All @@ -36,10 +36,10 @@ jobs:
with:
fetch-depth: 1

- name: Set up Python 3.9
- name: Set up Python 3.11
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
with:
python-version: 3.9
python-version: '3.11'

- name: Install dependencies
run: python3 -m pip install requests
Expand Down
2 changes: 1 addition & 1 deletion docs_conf.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

version_list: testing, latest, 3.34, 3.28, 3.22, 3.16, 3.10, 3.4, 2.18
# Fill this list with the languages we build for the release, space separated
supported_languages: en
supported_languages: en # cs de es fr hu it ja ko lt nl pt_BR pt_PT ro ru zh_Hans
10 changes: 5 additions & 5 deletions release_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ In February, the new version is labeled as LTR, and replaces the previous one in
These are the languages that will be published in the documentation.
A threshold of 5% is currently applied to candidates.
- [ ] In [docker-world.sh](docker-world.sh) file: complete the `langs` variable with the supported languages
- [ ] In the [makefile](makefile): add the supported languages to the `LANGUAGES` parameter
- [ ] In the [Makefile](Makefile): add the supported languages to the `LANGUAGES` parameter
- [ ] Copy the [locale](locale) folder from the old LTR branch to the new LTR branch
- [ ] Generate new English source files (see instructions in [README](README.md) file)
</details>
Expand Down Expand Up @@ -154,8 +154,8 @@ is being translated. So when a new LTR is published, we disconnect the old one a
### Repository and project configuration
<details>

- [ ] Make the new LTR the topmost version in the [docs page index](https:// docs.qgis.org) of QGIS main website
source file is available at [docs_index.html](https://github.com/qgis/QGIS-Website/blob/master/themes/qgis-theme/docs_index.html)
- [ ] Make the new LTR the topmost version in the [docs page index](https:// docs.qgis.org) of QGIS main website.
Source file is available at [docs_index.html](https://github.com/qgis/QGIS-Website/blob/master/themes/qgis-theme/docs_index.html)
- [ ] You might want to switch versions references between the 2 latest LTR (e.g. 3.28 <--> 3.34)

</details>
Expand All @@ -176,5 +176,5 @@ Automating the process as much as possible would lower the risk and make it less

* Some values are somehow copy-pasted across places while they could likely be put in a variable:

* languages list: they are defined in docs_conf.yml, makefile, docker-world.sh
* version number: it is defined in conf.py, makefile, docker-world.sh, cronjob.sh, doctest.dockerfile
* languages list: they are defined in docs_conf.yml, Makefile, docker-world.sh
* version number: it is defined in conf.py, Makefile, docker-world.sh, cronjob.sh, doctest.dockerfile
4 changes: 2 additions & 2 deletions scripts/fix_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ set -e

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

Expand Down

0 comments on commit 6946583

Please sign in to comment.