From 2f2f4d4ff56300dbc9838e37d20765e32b4e2714 Mon Sep 17 00:00:00 2001 From: Rory& Date: Mon, 2 Jun 2025 11:03:44 +0200 Subject: desktop changes --- ...ns-setup-python-from-5.5.0-to-5.6.0-18398.patch | 280 +++++++++++++++++++++ 1 file changed, 280 insertions(+) create mode 100644 packages/overlays/matrix-synapse/patches/0011-Bump-actions-setup-python-from-5.5.0-to-5.6.0-18398.patch (limited to 'packages/overlays/matrix-synapse/patches/0011-Bump-actions-setup-python-from-5.5.0-to-5.6.0-18398.patch') diff --git a/packages/overlays/matrix-synapse/patches/0011-Bump-actions-setup-python-from-5.5.0-to-5.6.0-18398.patch b/packages/overlays/matrix-synapse/patches/0011-Bump-actions-setup-python-from-5.5.0-to-5.6.0-18398.patch new file mode 100644 index 0000000..bb31453 --- /dev/null +++ b/packages/overlays/matrix-synapse/patches/0011-Bump-actions-setup-python-from-5.5.0-to-5.6.0-18398.patch @@ -0,0 +1,280 @@ +From 078cefd014806a67249ddb59b5976c7e93227f37 Mon Sep 17 00:00:00 2001 +From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> +Date: Mon, 19 May 2025 09:51:08 +0100 +Subject: [PATCH 11/34] Bump actions/setup-python from 5.5.0 to 5.6.0 (#18398) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bumps [actions/setup-python](https://github.com/actions/setup-python) +from 5.5.0 to 5.6.0. +
+Release notes +

Sourced from actions/setup-python's +releases.

+
+

v5.6.0

+

What's Changed

+ +

Full Changelog: https://github.com/actions/setup-python/compare/v5...v5.6.0

+
+
+
+Commits + +
+
+ + +[![Dependabot compatibility +score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-python&package-manager=github_actions&previous-version=5.5.0&new-version=5.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) + +Dependabot will resolve any conflicts with this PR as long as you don't +alter it yourself. You can also trigger a rebase manually by commenting +`@dependabot rebase`. + +[//]: # (dependabot-automerge-start) +[//]: # (dependabot-automerge-end) + +--- + +
+Dependabot commands and options +
+ +You can trigger Dependabot actions by commenting on this PR: +- `@dependabot rebase` will rebase this PR +- `@dependabot recreate` will recreate this PR, overwriting any edits +that have been made to it +- `@dependabot merge` will merge this PR after your CI passes on it +- `@dependabot squash and merge` will squash and merge this PR after +your CI passes on it +- `@dependabot cancel merge` will cancel a previously requested merge +and block automerging +- `@dependabot reopen` will reopen this PR if it is closed +- `@dependabot close` will close this PR and stop Dependabot recreating +it. You can achieve the same result by closing it manually +- `@dependabot show ignore conditions` will show all +of the ignore conditions of the specified dependency +- `@dependabot ignore this major version` will close this PR and stop +Dependabot creating any more for this major version (unless you reopen +the PR or upgrade to it yourself) +- `@dependabot ignore this minor version` will close this PR and stop +Dependabot creating any more for this minor version (unless you reopen +the PR or upgrade to it yourself) +- `@dependabot ignore this dependency` will close this PR and stop +Dependabot creating any more for this dependency (unless you reopen the +PR or upgrade to it yourself) + + +
+ +Signed-off-by: dependabot[bot] +Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +--- + .github/workflows/docs-pr.yaml | 2 +- + .github/workflows/docs.yaml | 2 +- + .github/workflows/latest_deps.yml | 2 +- + .github/workflows/poetry_lockfile.yaml | 2 +- + .github/workflows/release-artifacts.yml | 8 ++++---- + .github/workflows/tests.yml | 12 ++++++------ + 6 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/.github/workflows/docs-pr.yaml b/.github/workflows/docs-pr.yaml +index 616ef0f9cf..1f4f79598a 100644 +--- a/.github/workflows/docs-pr.yaml ++++ b/.github/workflows/docs-pr.yaml +@@ -24,7 +24,7 @@ jobs: + mdbook-version: '0.4.17' + + - name: Setup python +- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: "3.x" + +diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml +index 05ae608d06..930c71a8b4 100644 +--- a/.github/workflows/docs.yaml ++++ b/.github/workflows/docs.yaml +@@ -64,7 +64,7 @@ jobs: + run: echo 'window.SYNAPSE_VERSION = "${{ needs.pre.outputs.branch-version }}";' > ./docs/website_files/version.js + + - name: Setup python +- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: "3.x" + +diff --git a/.github/workflows/latest_deps.yml b/.github/workflows/latest_deps.yml +index 366bb4cddb..ee0dac3beb 100644 +--- a/.github/workflows/latest_deps.yml ++++ b/.github/workflows/latest_deps.yml +@@ -86,7 +86,7 @@ jobs: + -e POSTGRES_PASSWORD=postgres \ + -e POSTGRES_INITDB_ARGS="--lc-collate C --lc-ctype C --encoding UTF8" \ + postgres:${{ matrix.postgres-version }} +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: "3.x" + - run: pip install .[all,test] +diff --git a/.github/workflows/poetry_lockfile.yaml b/.github/workflows/poetry_lockfile.yaml +index 31b9147e98..1668ad81d2 100644 +--- a/.github/workflows/poetry_lockfile.yaml ++++ b/.github/workflows/poetry_lockfile.yaml +@@ -17,7 +17,7 @@ jobs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: '3.x' + - run: pip install tomli +diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml +index e03c9d2bd5..572d73e6ad 100644 +--- a/.github/workflows/release-artifacts.yml ++++ b/.github/workflows/release-artifacts.yml +@@ -28,7 +28,7 @@ jobs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: '3.x' + - id: set-distros +@@ -74,7 +74,7 @@ jobs: + ${{ runner.os }}-buildx- + + - name: Set up python +- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: '3.x' + +@@ -132,7 +132,7 @@ jobs: + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + # setup-python@v4 doesn't impose a default python version. Need to use 3.x + # here, because `python` on osx points to Python 2.7. +@@ -177,7 +177,7 @@ jobs: + + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: '3.10' + +diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml +index a7e35a0ece..848240f68e 100644 +--- a/.github/workflows/tests.yml ++++ b/.github/workflows/tests.yml +@@ -102,7 +102,7 @@ jobs: + + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: "3.x" + - run: "pip install 'click==8.1.1' 'GitPython>=3.1.20'" +@@ -112,7 +112,7 @@ jobs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: "3.x" + - run: .ci/scripts/check_lockfile.py +@@ -192,7 +192,7 @@ jobs: + with: + ref: ${{ github.event.pull_request.head.sha }} + fetch-depth: 0 +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: "3.x" + - run: "pip install 'towncrier>=18.6.0rc1'" +@@ -279,7 +279,7 @@ jobs: + if: ${{ needs.changes.outputs.linting_readme == 'true' }} + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: "3.x" + - run: "pip install rstcheck" +@@ -327,7 +327,7 @@ jobs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: "3.x" + - id: get-matrix +@@ -414,7 +414,7 @@ jobs: + sudo apt-get -qq install build-essential libffi-dev python3-dev \ + libxml2-dev libxslt-dev xmlsec1 zlib1g-dev libjpeg-dev libwebp-dev + +- - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 ++ - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + with: + python-version: '3.9' + +-- +2.49.0 + -- cgit 1.5.1