From 69465835138d31141dd36d4e0119556d15af8ad7 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Sun, 25 Feb 2024 13:26:56 +0100 Subject: [PATCH] Prepare branch for releasing 3.34 as LTR --- .github/workflows/pofiles.yml | 8 ++++---- .github/workflows/pull_minimized_translations.yml | 2 +- .github/workflows/translation_statistics.yml | 6 +++--- docs_conf.yml | 2 +- release_process.md | 10 +++++----- scripts/fix_versions.sh | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pofiles.yml b/.github/workflows/pofiles.yml index fcd992dd248..0794f72f7d5 100644 --- a/.github/workflows/pofiles.yml +++ b/.github/workflows/pofiles.yml @@ -3,7 +3,7 @@ name: Update English PO files for translation on: push: branches: - - release_3.28 + - release_3.34 paths: - 'docs/**' @@ -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: | diff --git a/.github/workflows/pull_minimized_translations.yml b/.github/workflows/pull_minimized_translations.yml index 5d331f8d0f6..84684dba50c 100644 --- a/.github/workflows/pull_minimized_translations.yml +++ b/.github/workflows/pull_minimized_translations.yml @@ -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 diff --git a/.github/workflows/translation_statistics.yml b/.github/workflows/translation_statistics.yml index cd959b8f585..74df5c4aa18 100644 --- a/.github/workflows/translation_statistics.yml +++ b/.github/workflows/translation_statistics.yml @@ -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 @@ -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 diff --git a/docs_conf.yml b/docs_conf.yml index d846a116f39..b1250d86a69 100644 --- a/docs_conf.yml +++ b/docs_conf.yml @@ -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 diff --git a/release_process.md b/release_process.md index 9f35068d477..a376e53c8e9 100644 --- a/release_process.md +++ b/release_process.md @@ -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) @@ -154,8 +154,8 @@ is being translated. So when a new LTR is published, we disconnect the old one a ### Repository and project configuration
-- [ ] 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)
@@ -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 diff --git a/scripts/fix_versions.sh b/scripts/fix_versions.sh index 686b02b1fa2..a7a9175a154 100644 --- a/scripts/fix_versions.sh +++ b/scripts/fix_versions.sh @@ -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}