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

Commit

Permalink
Tidy the building of sdists and wheels (#12051)
Browse files Browse the repository at this point in the history
* Don't build distribution pkgs in tests.yml
* Run `release-artifacts` on release branches
* Use backend-meta workflow for packaging
  • Loading branch information
David Robertson authored Feb 22, 2022
1 parent 1ae492c commit af2c1e3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 28 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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*"]
Expand Down Expand Up @@ -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:
Expand Down
17 changes: 1 addition & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -397,7 +383,6 @@ jobs:
- lint
- lint-crlf
- lint-newsfile
- lint-sdist
- trial
- trial-olddeps
- sytest
Expand Down
1 change: 1 addition & 0 deletions changelog.d/12051.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Tidy up GitHub Actions config which builds distributions for PyPI.

0 comments on commit af2c1e3

Please sign in to comment.