From af2c1e3d2a56c4042db27e70b72409ce8f4b406e Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Tue, 22 Feb 2022 11:33:37 +0000
Subject: [PATCH] Tidy the building of sdists and wheels (#12051)
* Don't build distribution pkgs in tests.yml
* Run `release-artifacts` on release branches
* Use backend-meta workflow for packaging
---
.github/workflows/release-artifacts.yml | 14 ++------------
.github/workflows/tests.yml | 17 +----------------
changelog.d/12051.misc | 1 +
3 files changed, 4 insertions(+), 28 deletions(-)
create mode 100644 changelog.d/12051.misc
diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
index eb294f1619..eee3633d50 100644
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -7,7 +7,7 @@ on:
# of things breaking (but only build one set of debs)
pull_request:
push:
- branches: ["develop"]
+ branches: ["develop", "release-*"]
# we do the full build on tags.
tags: ["v*"]
@@ -91,17 +91,7 @@ jobs:
build-sdist:
name: "Build pypi distribution files"
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- - run: pip install wheel
- - run: |
- python setup.py sdist bdist_wheel
- - uses: actions/upload-artifact@v2
- with:
- name: python-dist
- path: dist/*
+ uses: "matrix-org/backend-meta/.github/workflows/packaging.yml@v1"
# if it's a tag, create a release and attach the artifacts to it
attach-assets:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 75ac1304bf..bbf1033bdd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,24 +48,10 @@ jobs:
env:
PULL_REQUEST_NUMBER: ${{ github.event.number }}
- lint-sdist:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- with:
- python-version: "3.x"
- - run: pip install wheel
- - run: python setup.py sdist bdist_wheel
- - uses: actions/upload-artifact@v2
- with:
- name: Python Distributions
- path: dist/*
-
# Dummy step to gate other tests on without repeating the whole list
linting-done:
if: ${{ !cancelled() }} # Run this even if prior jobs were skipped
- needs: [lint, lint-crlf, lint-newsfile, lint-sdist]
+ needs: [lint, lint-crlf, lint-newsfile]
runs-on: ubuntu-latest
steps:
- run: "true"
@@ -397,7 +383,6 @@ jobs:
- lint
- lint-crlf
- lint-newsfile
- - lint-sdist
- trial
- trial-olddeps
- sytest
diff --git a/changelog.d/12051.misc b/changelog.d/12051.misc
new file mode 100644
index 0000000000..9959191352
--- /dev/null
+++ b/changelog.d/12051.misc
@@ -0,0 +1 @@
+Tidy up GitHub Actions config which builds distributions for PyPI.
\ No newline at end of file
--
GitLab