Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit af2c1e3

Browse files
author
David Robertson
authored
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
1 parent 1ae492c commit af2c1e3

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

.github/workflows/release-artifacts.yml

+2-12
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
# of things breaking (but only build one set of debs)
88
pull_request:
99
push:
10-
branches: ["develop"]
10+
branches: ["develop", "release-*"]
1111

1212
# we do the full build on tags.
1313
tags: ["v*"]
@@ -91,17 +91,7 @@ jobs:
9191

9292
build-sdist:
9393
name: "Build pypi distribution files"
94-
runs-on: ubuntu-latest
95-
steps:
96-
- uses: actions/checkout@v2
97-
- uses: actions/setup-python@v2
98-
- run: pip install wheel
99-
- run: |
100-
python setup.py sdist bdist_wheel
101-
- uses: actions/upload-artifact@v2
102-
with:
103-
name: python-dist
104-
path: dist/*
94+
uses: "matrix-org/backend-meta/.github/workflows/packaging.yml@v1"
10595

10696
# if it's a tag, create a release and attach the artifacts to it
10797
attach-assets:

.github/workflows/tests.yml

+1-16
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,10 @@ jobs:
4848
env:
4949
PULL_REQUEST_NUMBER: ${{ github.event.number }}
5050

51-
lint-sdist:
52-
runs-on: ubuntu-latest
53-
steps:
54-
- uses: actions/checkout@v2
55-
- uses: actions/setup-python@v2
56-
with:
57-
python-version: "3.x"
58-
- run: pip install wheel
59-
- run: python setup.py sdist bdist_wheel
60-
- uses: actions/upload-artifact@v2
61-
with:
62-
name: Python Distributions
63-
path: dist/*
64-
6551
# Dummy step to gate other tests on without repeating the whole list
6652
linting-done:
6753
if: ${{ !cancelled() }} # Run this even if prior jobs were skipped
68-
needs: [lint, lint-crlf, lint-newsfile, lint-sdist]
54+
needs: [lint, lint-crlf, lint-newsfile]
6955
runs-on: ubuntu-latest
7056
steps:
7157
- run: "true"
@@ -397,7 +383,6 @@ jobs:
397383
- lint
398384
- lint-crlf
399385
- lint-newsfile
400-
- lint-sdist
401386
- trial
402387
- trial-olddeps
403388
- sytest

changelog.d/12051.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Tidy up GitHub Actions config which builds distributions for PyPI.

0 commit comments

Comments
 (0)