Skip to content

Commit 71e9c1c

Browse files
committed
chore(dev): dry-run release CI on push
This removes the "Build Python package" step from the "Build CI" workflow in favor of reusing the build job in the release CI workflow. It builds off the changes in adafruit#135 by adding more triggers to the release CI. I also removed some steps in the Build CI workflow that would only make sense if experimenting with GitHub Actions. This also uploads dists to PyPI using the trusted publisher setup in the PyPI project settings.
1 parent e135706 commit 71e9c1c

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,10 @@ jobs:
1717
build-and-test:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- name: Dump GitHub context
21-
env:
22-
GITHUB_CONTEXT: ${{ toJson(github) }}
23-
run: echo "$GITHUB_CONTEXT"
2420
- name: Set up Python 3.12
2521
uses: actions/setup-python@v6
2622
with:
2723
python-version: "3.12"
28-
- name: Versions
29-
run: |
30-
python3 --version
3124
- name: Checkout Current Repo
3225
uses: actions/checkout@v6
3326
with:
@@ -40,8 +33,6 @@ jobs:
4033
sudo apt-get install libudev-dev libusb-1.0
4134
sudo apt-get install -y gettext
4235
pip install -r requirements.txt
43-
- name: Library version
44-
run: git describe --dirty --always --tags
4536
- name: Install package locally
4637
run: pip install -e .
4738
- name: Test building single package
@@ -55,8 +46,3 @@ jobs:
5546
git clone --recurse-submodules https://github.com/adafruit/CircuitPython_Community_Bundle.git
5647
cd CircuitPython_Community_Bundle
5748
circuitpython-build-bundles --filename_prefix test-bundle --library_location libraries --library_depth 2
58-
- name: Build Python package
59-
run: |
60-
pip install --upgrade setuptools wheel twine readme_renderer testresources
61-
python setup.py sdist
62-
twine check dist/*

.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
name: Release Actions
77

88
on:
9+
pull_request:
10+
branches: [main]
11+
push:
12+
branches: [main]
913
release:
1014
types: [published]
1115

@@ -38,18 +42,14 @@ jobs:
3842
if: github.event_name == 'release' && startsWith(github.repository_owner, 'adafruit')
3943
needs: [build]
4044
runs-on: ubuntu-latest
45+
permissions:
46+
# needed for authenticating with PyPI trusted publisher
47+
id-token: write
4148
steps:
4249
- name: Download build artifacts
4350
uses: actions/download-artifact@v6
4451
with:
4552
name: dist
4653
path: ./dist
47-
- name: Set up Python
48-
uses: actions/setup-python@v6
49-
with:
50-
python-version: '3.12'
5154
- name: Publish to PyPI
52-
env:
53-
TWINE_USERNAME: ${{ secrets.pypi_username }}
54-
TWINE_PASSWORD: ${{ secrets.pypi_password }}
55-
run: pipx run twine upload dist/*
55+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0

0 commit comments

Comments
 (0)