Skip to content

Commit

Permalink
Revert "ECC-1923: build own openjpeg lib as part of binary wheel"
Browse files Browse the repository at this point in the history
This reverts commit 3421912.
  • Loading branch information
iainrussell committed Sep 26, 2024
1 parent 5a8f65d commit 66b5b2d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-wheel-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:

deploy:

#if: ${{ github.ref_type == 'tag' || github.event_name == 'release' }}
if: ${{ github.ref_type == 'tag' || github.event_name == 'release' }}

strategy:
fail-fast: false
Expand Down Expand Up @@ -149,4 +149,4 @@ jobs:
twine upload artifact-${{ matrix.python-version }}/*.whl
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_TEST_API_TOKEN }}
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/build-wheel-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:

deploy:

#if: ${{ github.ref_type == 'tag' || github.event_name == 'release' }}
if: ${{ github.ref_type == 'tag' || github.event_name == 'release' }}

needs: [test, build]

Expand Down Expand Up @@ -154,4 +154,4 @@ jobs:
twine upload artifact-${{ matrix.arch_type }}-${{ matrix.python-version }}/*.whl
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_TEST_API_TOKEN }}
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
8 changes: 4 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
wheel-macos:
uses: ./.github/workflows/build-wheel-macos.yml
secrets: inherit
#pypi:
# needs: [wheel-linux, wheel-macos]
# uses: ecmwf-actions/reusable-workflows/.github/workflows/cd-pypi.yml@v2
# secrets: inherit
pypi:
needs: [wheel-linux, wheel-macos]
uses: ecmwf-actions/reusable-workflows/.github/workflows/cd-pypi.yml@v2
secrets: inherit

0 comments on commit 66b5b2d

Please sign in to comment.