From 66b5b2dbaa55b17abe10635a6900ba8e45318d9e Mon Sep 17 00:00:00 2001 From: Iain Russell Date: Thu, 26 Sep 2024 12:59:14 +0100 Subject: [PATCH] Revert "ECC-1923: build own openjpeg lib as part of binary wheel" This reverts commit 34219121cdeb850f1ae18f1559a707a2d679c5e8. --- .github/workflows/build-wheel-linux.yml | 4 ++-- .github/workflows/build-wheel-macos.yml | 4 ++-- .github/workflows/cd.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-wheel-linux.yml b/.github/workflows/build-wheel-linux.yml index 0edbf56..c64fc58 100644 --- a/.github/workflows/build-wheel-linux.yml +++ b/.github/workflows/build-wheel-linux.yml @@ -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 @@ -149,4 +149,4 @@ jobs: twine upload artifact-${{ matrix.python-version }}/*.whl env: TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_TEST_API_TOKEN }} \ No newline at end of file + TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/build-wheel-macos.yml b/.github/workflows/build-wheel-macos.yml index d265e84..1c848ed 100644 --- a/.github/workflows/build-wheel-macos.yml +++ b/.github/workflows/build-wheel-macos.yml @@ -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] @@ -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 }} \ No newline at end of file + TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1677f32..23a7e32 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -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