Skip to content

Commit 3bb62b8

Browse files
committed
Attempt to fix release workflow
1 parent 80438dd commit 3bb62b8

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

.github/workflows/merge.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@ jobs:
3636
key: >-
3737
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
3838
steps.python.outputs.python-version }}-${{
39-
hashFiles('requirements_test.txt') }}-${{
4039
hashFiles('setup.py') }}
4140
restore-keys: |
42-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements_test.txt') }}-${{ hashFiles('setup.py') }}-
43-
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements_test.txt') }}
41+
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('setup.py') }}
4442
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-
4543
- name: Create Python virtual environment
4644
if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -50,20 +48,6 @@ jobs:
5048
pip install -U pip setuptools
5149
pip install -e .
5250
pip install -r requirements_test.txt
53-
- name: Restore pre-commit environment from cache
54-
id: cache-precommit
55-
uses: actions/cache@v2
56-
with:
57-
path: ${{ env.PRE_COMMIT_HOME }}
58-
key: |
59-
${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
60-
restore-keys: |
61-
${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-
62-
- name: Install pre-commit dependencies
63-
if: steps.cache-precommit.outputs.cache-hit != 'true'
64-
run: |
65-
. venv/bin/activate
66-
pre-commit install-hooks
6751
6852
publishing:
6953
name: Build and publish Python 🐍 distributions 📦 to PyPI
@@ -87,7 +71,6 @@ jobs:
8771
key: >-
8872
${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
8973
steps.python.outputs.python-version }}-${{
90-
hashFiles('requirements_test.txt') }}-${{
9174
hashFiles('setup.py') }}
9275
- name: Fail job if Python cache restore failed
9376
if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -97,7 +80,7 @@ jobs:
9780
- name: Build a distribution
9881
run: >-
9982
python setup.py sdist
100-
- name: Publish distribution 📦 to Test PyPI
83+
- name: Publish distribution 📦 to PyPI
10184
uses: pypa/gh-action-pypi-publish@master
10285
with:
10386
password: ${{ secrets.pypi_token }}

0 commit comments

Comments
 (0)