diff --git a/.github/workflows/merge_release.yml b/.github/workflows/merge_release.yml index e3890682fe..067539df1c 100644 --- a/.github/workflows/merge_release.yml +++ b/.github/workflows/merge_release.yml @@ -37,7 +37,7 @@ jobs: git merge origin/main --strategy-option theirs -m "[Bot] Merge branch \"main\" into \"feature\"." git push origin feature - name: Merge into bugfix branch - if: ${{ github.event.release.target_commitish == 'main' }} || ${{ github.event.release.target_commitish == 'feature' }} + if: ${{ github.event.release.target_commitish == 'main' || github.event.release.target_commitish == 'feature' }} run: | git checkout -b bugfix origin/bugfix git merge origin/feature --strategy-option theirs -m "[Bot] Merge branch \"feature\" into \"bugfix\"." diff --git a/doc/requirements.txt b/doc/requirements.txt index 8b73e75c8b..674f0b7ad9 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,7 +1,7 @@ breathe >= 4.35, < 4.36 -furo == 2024.5.6 +furo == 2024.7.18 myst-parser >= 3.0, < 3.1 -sphinx >= 7.2, < 7.3 +sphinx >= 7.4, < 7.5 sphinx-copybutton >= 0.5, < 0.6 sphinx-favicon >= 1.0, < 1.1 sphinx-inline-tabs == 2023.4.21 diff --git a/scons/requirements.txt b/scons/requirements.txt index 6fc8b9ac4a..ffab0f2a44 100644 --- a/scons/requirements.txt +++ b/scons/requirements.txt @@ -5,11 +5,11 @@ cython >= 3.0, < 3.1 isort >= 5.13, < 5.14 mdformat >= 0.7, < 0.8 mdformat-myst >= 0.1, < 0.2 -meson >= 1.4, < 1.5 +meson >= 1.5, < 1.6 ninja >= 1.11, < 1.12 pylint >= 3.2, < 3.3 setuptools -scons >= 4.7, < 4.8 +scons >= 4.8, < 4.9 unittest-xml-reporting >= 3.2, < 3.3 wheel >= 0.43, < 0.44 yamlfix >= 1.16, < 1.17