Skip to content

Commit ca4a765

Browse files
committed
🧪 Stop calling cleanup-dists tox env in CI
1 parent 90ca482 commit ca4a765

4 files changed

Lines changed: 13 additions & 32 deletions

File tree

.github/reusables/tox-dev/workflow/reusable-tox/hooks/post-src-checkout/action.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,12 @@ runs:
3737
}}
3838
3939
- name: Fetch the GHA artifact with the version patch
40-
# if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
41-
if: fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
40+
if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
4241
uses: actions/download-artifact@v4
4342
with:
4443
name: changelog
4544
- name: Apply the changelog patch but do not commit it
46-
# if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
47-
if: fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
45+
if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
4846
run: >-
4947
git apply '${{
5048
fromJSON(
@@ -53,8 +51,7 @@ runs:
5351
}}'
5452
shell: bash
5553
- name: Delete the changelog patch file
56-
# if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
57-
if: fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
54+
if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
5855
run: >-
5956
rm -fv '${{
6057
fromJSON(
@@ -63,8 +60,7 @@ runs:
6360
}}'
6461
shell: bash
6562
- name: Pretend that changelog updates never happened
66-
# if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
67-
if: fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
63+
if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
6864
run: |
6965
git diff --color=always
7066
git update-index --assume-unchanged $(git ls-files --modified)

.github/reusables/tox-dev/workflow/reusable-tox/hooks/post-tox-run/action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ runs:
1919
using: composite
2020
steps:
2121
- name: Verify that the artifacts with expected names got created
22-
# if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
23-
if: fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
22+
if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
2423
run: >
2524
# Verify that the artifacts with expected names got created
2625
@@ -38,8 +37,7 @@ runs:
3837
}}'
3938
shell: bash
4039
- name: Store the distribution packages
41-
# if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
42-
if: fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
40+
if: fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
4341
uses: actions/upload-artifact@v4
4442
with:
4543
name: >-

.github/reusables/tox-dev/workflow/reusable-tox/hooks/prepare-for-tox-run/action.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ runs:
1919
using: composite
2020
steps:
2121
- name: Drop Git tags from HEAD for non-tag-create events
22-
# if: >-
23-
# fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
2422
if: >-
25-
fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
23+
fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
2624
&& !fromJSON(
2725
fromJSON(
2826
inputs.job-dependencies-context
@@ -35,10 +33,8 @@ runs:
3533
shell: bash
3634

3735
- name: Setup git user as [bot]
38-
# if: >-
39-
# fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
4036
if: >-
41-
fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
37+
fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
4238
&& (
4339
fromJSON(
4440
fromJSON(
@@ -60,10 +56,8 @@ runs:
6056
).pre-setup.outputs.git-tag
6157
}}
6258
for setuptools-scm to set the desired version
63-
# if: >-
64-
# fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
6559
if: >-
66-
fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
60+
fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
6761
&& fromJSON(
6862
fromJSON(
6963
inputs.job-dependencies-context
@@ -86,10 +80,8 @@ runs:
8680
shell: bash
8781
8882
- name: Install tomlkit Python distribution package
89-
# if: >-
90-
# fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
9183
if: >-
92-
fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
84+
fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
9385
&& fromJSON(
9486
fromJSON(
9587
inputs.job-dependencies-context
@@ -99,10 +91,8 @@ runs:
9991
python -m pip install --user tomlkit
10092
shell: bash
10193
- name: Instruct setuptools-scm not to add a local version part
102-
# if: >-
103-
# fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
10494
if: >-
105-
fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
95+
fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
10696
&& fromJSON(
10797
fromJSON(
10898
inputs.job-dependencies-context
@@ -122,10 +112,8 @@ runs:
122112
pyproject_toml_path.write_text(patched_pyproject_toml_txt)
123113
shell: python
124114
- name: Pretend that pyproject.toml is unchanged
125-
# if: >-
126-
# fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
127115
if: >-
128-
fromJSON(inputs.calling-job-context).toxenv == 'cleanup-dists,build-dists'
116+
fromJSON(inputs.calling-job-context).toxenv == 'build-dists'
129117
&& fromJSON(
130118
fromJSON(
131119
inputs.job-dependencies-context

.github/workflows/ci-cd.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,7 @@ jobs:
548548
python-version: 3.11 # FIXME??
549549
runner-vm-os: ubuntu-latest
550550
timeout-minutes: 2
551-
# toxenv: build-dists
552-
toxenv: cleanup-dists,build-dists # FIXME??
551+
toxenv: build-dists
553552
tox-tool-deps: tox
554553
xfail: false
555554

0 commit comments

Comments
 (0)