Skip to content

Commit 195bfc2

Browse files
committed
corrections/update
1 parent b4ce3f8 commit 195bfc2

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<<<<<<< HEAD
21
name: Publish package
3-
=======
42
# This workflow will upload a Python Package using Twine when a release is created
53
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
64

@@ -10,13 +8,11 @@ name: Publish package
108
# documentation.
119

1210
name: Upload Python Package
13-
>>>>>>> e0aa78494152ccb561414e3c0595297eb7f86980
1411

1512
on:
16-
release:
13+
release
1714
types: [published]
1815

19-
<<<<<<< HEAD
2016
jobs:
2117
build:
2218
runs-on: ubuntu-latest
@@ -35,7 +31,7 @@ jobs:
3531
uses: actions/cache@v3
3632
with:
3733
path: ~/.cache/pip
38-
key: ${{ runner.os }}-pip-3.10-${{ hashFiles('package.json') }}
34+
key: ${{ runner.os }}-pip-3.10-${{ hashFiles('pyproject.toml') }}
3935
restore-keys: |
4036
${{ runner.os }}-pip-3.10-
4137
- name: Build extension package
@@ -47,7 +43,6 @@ jobs:
4743
# if: startsWith(github.ref, 'refs/tags')
4844
uses: pypa/gh-action-pypi-publish@release/v1
4945
with:
50-
=======
5146
permissions:
5247
contents: read
5348

@@ -72,5 +67,4 @@ jobs:
7267
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
7368
with:
7469
user: __token__
75-
>>>>>>> e0aa78494152ccb561414e3c0595297eb7f86980
7670
password: ${{ secrets.PYPI_API_TOKEN }}

0 commit comments

Comments
 (0)