From d0bdd41a75ac71281311aa7e03d488e8367772e7 Mon Sep 17 00:00:00 2001 From: reivilibre Date: Wed, 24 Jan 2024 11:59:15 +0000 Subject: [PATCH 1/3] Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to breaking changes. (#16847) Partially reverts #16796 This is causing errors of the form: ``` Error: Failed to CreateArtifact: Received non-retryable error: Failed request: (409) Conflict: an artifact with this name already exists on the workflow run ``` for the debs and wheels stages. There were breaking changes that weren't included in the dependabot changelog (:/): https://github.com/actions/upload-artifact#breaking-changes Base: `release-v1.100` Original commit schedule, with full messages:
  1. Downgrade the `upload-artifact` and `download-artifact` actions to v3
--------- Signed-off-by: Olivier Wilkinson (reivilibre) --- .github/workflows/release-artifacts.yml | 8 ++++---- changelog.d/16847.misc | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 changelog.d/16847.misc diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 3773b97c7..5d4a4fe1d 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -92,7 +92,7 @@ jobs: mv /tmp/.buildx-cache-new /tmp/.buildx-cache - name: Upload debs as artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 # Don't upgrade to v4; broken: https://github.com/actions/upload-artifact#breaking-changes with: name: debs path: debs/* @@ -156,7 +156,7 @@ jobs: CARGO_NET_GIT_FETCH_WITH_CLI: true CIBW_ENVIRONMENT_PASS_LINUX: CARGO_NET_GIT_FETCH_WITH_CLI - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 # Don't upgrade to v4; broken: https://github.com/actions/upload-artifact#breaking-changes with: name: Wheel path: ./wheelhouse/*.whl @@ -177,7 +177,7 @@ jobs: - name: Build sdist run: python -m build --sdist - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 # Don't upgrade to v4; broken: https://github.com/actions/upload-artifact#breaking-changes with: name: Sdist path: dist/*.tar.gz @@ -194,7 +194,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download all workflow run artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 # Don't upgrade to v4, it should match upload-artifact - name: Build a tarball for the debs run: tar -cvJf debs.tar.xz debs - name: Attach to release diff --git a/changelog.d/16847.misc b/changelog.d/16847.misc new file mode 100644 index 000000000..95650f01f --- /dev/null +++ b/changelog.d/16847.misc @@ -0,0 +1 @@ +Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to breaking changes. \ No newline at end of file From cf7109fc352ce7224214f719e0c3e67f7c4a7942 Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Wed, 24 Jan 2024 12:01:20 +0000 Subject: [PATCH 2/3] 1.100.0rc2 --- CHANGES.md | 9 +++++++++ changelog.d/16847.misc | 1 - debian/changelog | 6 ++++++ pyproject.toml | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/16847.misc diff --git a/CHANGES.md b/CHANGES.md index 4bef78409..b91ef3d73 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,14 @@ +# Synapse 1.100.0rc2 (2024-01-24) + +### Internal Changes + +- Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to breaking changes. ([\#16847](https://github.com/element-hq/synapse/issues/16847)) + + # Synapse 1.100.0rc1 (2024-01-23) +*This version was never released to PyPI or the Debian repository due to failures in the automatic part of the release process.* + ### Features - Advertise experimental support for [MSC4028](https://github.com/matrix-org/matrix-spec-proposals/pull/4028) through `/_matrix/clients/versions` if enabled. Contributed by @hanadi92. ([\#16787](https://github.com/element-hq/synapse/issues/16787)) diff --git a/changelog.d/16847.misc b/changelog.d/16847.misc deleted file mode 100644 index 95650f01f..000000000 --- a/changelog.d/16847.misc +++ /dev/null @@ -1 +0,0 @@ -Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to breaking changes. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index ca0e2aec4..5a86b6302 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.100.0~rc2) stable; urgency=medium + + * New Synapse release 1.100.0rc2. + + -- Synapse Packaging team Wed, 24 Jan 2024 11:59:51 +0000 + matrix-synapse-py3 (1.100.0~rc1) stable; urgency=medium * New Synapse release 1.100.0rc1. diff --git a/pyproject.toml b/pyproject.toml index 3bfbb1cc4..d4cb01f7c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust" [tool.poetry] name = "matrix-synapse" -version = "1.100.0rc1" +version = "1.100.0rc2" description = "Homeserver for the Matrix decentralised comms protocol" authors = ["Matrix.org Team and Contributors "] license = "AGPL-3.0-or-later" From 594842cf7fe4cb3afde4c613345d96019e7006cb Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Wed, 24 Jan 2024 12:05:03 +0000 Subject: [PATCH 3/3] Tweak changelog --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index b91ef3d73..e9478ea1a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,7 @@ # Synapse 1.100.0rc2 (2024-01-24) +This version is the same as 1.100.0rc1 but with fixes to the release process. + ### Internal Changes - Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to breaking changes. ([\#16847](https://github.com/element-hq/synapse/issues/16847))