Skip to content

Commit f26af58

Browse files
committed
Apply suggestions from code reviews
1 parent 047065f commit f26af58

File tree

1 file changed

+24
-28
lines changed

1 file changed

+24
-28
lines changed

.github/workflows/pypi.yml

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ on:
33
push:
44
branches:
55
- main
6-
- auto-release
76
pull_request:
87
branches: [main]
98
release:
@@ -16,14 +15,28 @@ concurrency:
1615
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
1716
cancel-in-progress: true
1817

18+
permissions: {}
19+
1920
jobs:
2021
check_changes:
2122
runs-on: ubuntu-latest
2223
outputs:
23-
should_run: ${{ steps.filter.outputs.any_changed }}
24+
should_run: |
25+
if [[ "${{ github.event_name == 'release' ||
26+
(
27+
github.ref == 'refs/heads/main' ||
28+
github.event_name == 'pull_request'
29+
) && steps.filter.outputs.any_changed == 'true'
30+
}}" == "true" ]]; then
31+
echo "true"
32+
else
33+
echo "false"
34+
fi
2435
steps:
2536
- uses: actions/checkout@v4
26-
- uses: dorny/paths-filter@v2
37+
with:
38+
persist-credentials: false
39+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
2740
id: filter
2841
with:
2942
filters: |
@@ -39,12 +52,9 @@ jobs:
3952
make_sdist:
4053
name: Make SDist
4154
needs: check_changes
42-
# Run if it's a release, auto-release branch, or if relevant files changed on main
55+
# Run if it's a release or if relevant files changed on main
4356
if: |
44-
github.event_name == 'release' ||
45-
github.ref == 'refs/heads/auto-release' ||
46-
(github.ref == 'refs/heads/main' && needs.check_changes.outputs.should_run == 'true') ||
47-
(github.event_name == 'pull_request' && needs.check_changes.outputs.should_run == 'true')
57+
needs.check_changes.outputs.should_run == 'true'
4858
runs-on: ubuntu-latest
4959
permissions:
5060
# write id-token and attestations are required to attest build provenance
@@ -75,12 +85,9 @@ jobs:
7585
run_checks:
7686
name: Build & inspect our package.
7787
needs: check_changes
78-
# Run if it's a release, auto-release branch, or if relevant files changed on main
88+
# Run if it's a release or if relevant files changed on main
7989
if: |
80-
github.event_name == 'release' ||
81-
github.ref == 'refs/heads/auto-release' ||
82-
(github.ref == 'refs/heads/main' && needs.check_changes.outputs.should_run == 'true') ||
83-
(github.event_name == 'pull_request' && needs.check_changes.outputs.should_run == 'true')
90+
needs.check_changes.outputs.should_run == 'true'
8491
# Note: the resulting builds are not actually published.
8592
# This is purely for additional testing and diagnostic purposes.
8693
runs-on: ubuntu-latest
@@ -95,12 +102,9 @@ jobs:
95102
build_wheels:
96103
name: Build wheels for ${{ matrix.platform }}
97104
needs: check_changes
98-
# Run if it's a release, auto-release branch, or if relevant files changed on main
105+
# Run if it's a release or if relevant files changed on main
99106
if: |
100-
github.event_name == 'release' ||
101-
github.ref == 'refs/heads/auto-release' ||
102-
(github.ref == 'refs/heads/main' && needs.check_changes.outputs.should_run == 'true') ||
103-
(github.event_name == 'pull_request' && needs.check_changes.outputs.should_run == 'true')
107+
needs.check_changes.outputs.should_run == 'true'
104108
runs-on: ${{ matrix.platform }}
105109
permissions:
106110
# write id-token and attestations are required to attest build provenance
@@ -136,12 +140,9 @@ jobs:
136140
build_universal_wheel:
137141
name: Build universal wheel for Pyodide
138142
needs: check_changes
139-
# Run if it's a release, auto-release branch, or if relevant files changed on main
143+
# Run if it's a release or if relevant files changed on main
140144
if: |
141-
github.event_name == 'release' ||
142-
github.ref == 'refs/heads/auto-release' ||
143-
(github.ref == 'refs/heads/main' && needs.check_changes.outputs.should_run == 'true') ||
144-
(github.event_name == 'pull_request' && needs.check_changes.outputs.should_run == 'true')
145+
needs.check_changes.outputs.should_run == 'true'
145146
runs-on: ubuntu-latest
146147
permissions:
147148
# write id-token and attestations are required to attest build provenance
@@ -180,11 +181,6 @@ jobs:
180181
check_dist:
181182
name: Check dist
182183
needs: [check_changes, make_sdist, build_wheels]
183-
if: |
184-
github.event_name == 'release' ||
185-
github.ref == 'refs/heads/auto-release' ||
186-
(github.ref == 'refs/heads/main' && needs.check_changes.outputs.should_run == 'true') ||
187-
(github.event_name == 'pull_request' && needs.check_changes.outputs.should_run == 'true')
188184
runs-on: ubuntu-22.04
189185
steps:
190186
- uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)