From 0b0d0459fc1d8a9af13b127759e2924618b54b22 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Tue, 20 Aug 2024 18:38:49 +0200 Subject: [PATCH 1/2] ci: use Python 3.12 for parsing dates --- .github/workflows/build.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5975b94c4c7..c26977762b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,6 +152,22 @@ jobs: submodules: recursive fetch-depth: 0 # allows for tags access + - name: Temporary test + uses: actions/setup-python@v5 + with: + python-version: "3.12" + + - name: Format changes + id: format-changes + run: | + delimiter=$(openssl rand -hex 32) + { + echo "changelog<<$delimiter" + python3 ./.CI/format-recent-changes.py + echo $delimiter + } >> "$GITHUB_OUTPUT" + shell: bash + - name: Install Qt5 if: startsWith(matrix.qt-version, '5.') uses: jurplel/install-qt-action@v4.0.0 @@ -389,6 +405,10 @@ jobs: working-directory: release-artifacts shell: bash + - uses: actions/setup-python@v5 + with: + python-version: "3.12" + - name: Format changes id: format-changes run: | From cedcca784ffee41b65df3cf94e3c0bb9a7efe2fb Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Tue, 20 Aug 2024 18:41:35 +0200 Subject: [PATCH 2/2] chore: remove test and add changelog entry --- .github/workflows/build.yml | 19 ++----------------- CHANGELOG.md | 2 +- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c26977762b1..935c4bda1c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -152,22 +152,6 @@ jobs: submodules: recursive fetch-depth: 0 # allows for tags access - - name: Temporary test - uses: actions/setup-python@v5 - with: - python-version: "3.12" - - - name: Format changes - id: format-changes - run: | - delimiter=$(openssl rand -hex 32) - { - echo "changelog<<$delimiter" - python3 ./.CI/format-recent-changes.py - echo $delimiter - } >> "$GITHUB_OUTPUT" - shell: bash - - name: Install Qt5 if: startsWith(matrix.qt-version, '5.') uses: jurplel/install-qt-action@v4.0.0 @@ -405,7 +389,8 @@ jobs: working-directory: release-artifacts shell: bash - - uses: actions/setup-python@v5 + - name: Setup Python + uses: actions/setup-python@v5 with: python-version: "3.12" diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a2af1cb559..61344090064 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,7 +68,7 @@ - Dev: Refactored a few `#define`s into `const(expr)` and cleaned includes. (#5527) - Dev: Added `FlagsEnum::isEmpty`. (#5550) - Dev: Prepared for Qt 6.8 by addressing some deprecations. (#5529) -- Dev: Recent changes are now shown in the nightly release description. (#5553) +- Dev: Recent changes are now shown in the nightly release description. (#5553, #5554) ## 2.5.1