exclude libjvm.so

jpy-consortium · Oct 23, 2024 · 1524c8d · 1524c8d
1 parent 2daf3e2
commit 1524c8d
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 69 deletions.
diff --git a/.github/workflows/build_ft_wheel.yml b/.github/workflows/build_ft_wheel.yml
@@ -7,61 +7,61 @@ on:
     branches: [ 'master', 'release/v*' ]
 
 jobs:
-#  bdist-wheels:
-#    runs-on: ${{ matrix.info.machine }}
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        info:
-#          - { machine: 'ubuntu-20.04', python: '3.13t', arch: 'amd64', cmd: '.github/env/Linux/bdist-wheel.sh' }
-#          - { machine: 'macos-13', python: '3.13t', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
-#          - { machine: 'macos-latest', python: '3.13t', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
-#
-#    steps:
-#      - uses: actions/checkout@v4
-#
-#      - uses: astral-sh/setup-uv@v3
-#      - run: |
-#          uv python install 3.13t
-#          uv venv --python 3.13t
-#          source .venv/bin/activate
-#          uv pip install pip
-#          echo $JAVA_HOME
-#          echo PATH=$PATH >> $GITHUB_ENV
-#
-#      - run: ${{ matrix.info.cmd }}
-#
-#      - uses: actions/upload-artifact@v4
-#        with:
-#          name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}-${{ matrix.info.arch }}
-#          path: dist/*.whl
-#          retention-days: 1
-#
-#  bdist-wheels-windows:
-#    runs-on: ${{ matrix.info.machine }}
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        info:
-#          - { machine: 'windows-2022', python: '3.13t', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
-#
-#    steps:
-#      - uses: actions/checkout@v4
-#
-#      - uses: astral-sh/setup-uv@v3
-#      - run: |
-#          uv python install 3.13t
-#          uv venv --python 3.13t
-#          .venv\Scripts\Activate.ps1
-#          uv pip install pip
-#          echo PATH=%PATH% >> $GITHUB_ENV
-#          ${{ matrix.info.cmd }}
-#
-#      - uses: actions/upload-artifact@v4
-#        with:
-#          name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}-${{ matrix.info.arch }}
-#          path: dist/*.whl
-#          retention-days: 1
+  bdist-wheels:
+    runs-on: ${{ matrix.info.machine }}
+    strategy:
+      fail-fast: false
+      matrix:
+        info:
+          - { machine: 'ubuntu-20.04', python: '3.13t', arch: 'amd64', cmd: '.github/env/Linux/bdist-wheel.sh' }
+          - { machine: 'macos-13', python: '3.13t', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+          - { machine: 'macos-latest', python: '3.13t', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: astral-sh/setup-uv@v3
+      - run: |
+          uv python install ${{ matrix.info.python }}
+          uv venv --python ${{ matrix.info.python }}
+          source .venv/bin/activate
+          uv pip install pip
+          echo $JAVA_HOME
+          echo PATH=$PATH >> $GITHUB_ENV
+
+      - run: ${{ matrix.info.cmd }}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}-${{ matrix.info.arch }}
+          path: dist/*.whl
+          retention-days: 1
+
+  bdist-wheels-windows:
+    runs-on: ${{ matrix.info.machine }}
+    strategy:
+      fail-fast: false
+      matrix:
+        info:
+          - { machine: 'windows-2022', python: '3.13t', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: astral-sh/setup-uv@v3
+      - run: |
+          uv python install ${{ matrix.info.python }}
+          uv venv --python ${{ matrix.info.python }}
+          .venv\Scripts\Activate.ps1
+          uv pip install pip
+          echo PATH=%PATH% >> $GITHUB_ENV
+          ${{ matrix.info.cmd }}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}-${{ matrix.info.arch }}
+          path: dist/*.whl
+          retention-days: 1
 
   bdist-wheels-linux-aarch64:
     runs-on: ${{ matrix.info.machine }}
@@ -77,14 +77,6 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
-#      - uses: astral-sh/setup-uv@v3
-#      - run: |
-#          uv python install 3.13t
-#          uv venv --python 3.13t
-#          source .venv/bin/activate
-#          uv pip install pip
-#          echo PATH=$PATH >> $GITHUB_ENV
-
       - name: Build wheels
         uses: pypa/[email protected]
         env:
@@ -99,10 +91,12 @@ jobs:
             tar xf /tmp/apache-maven-3.8.8-bin.tar.gz -C /opt &&
             ln -s /opt/apache-maven-3.8.8/bin/mvn /usr/bin/mvn
           CIBW_ENVIRONMENT: JAVA_HOME=/etc/alternatives/jre_11_openjdk
+          CIBW_REPAIR_WHEEL_COMMAND_LINUX: 'auditwheel repair --exclude libjvm.so -w {dest_dir} {wheel}'
+
         with:
           package-dir: .
           output-dir: dist
-#            config-file: "{package}/pyproject.toml"
+        run: python -
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -38,6 +38,11 @@ jobs:
     steps:
         - uses: actions/checkout@v4
 
+        - uses: actions/setup-java@v4
+          with:
+            distribution: 'temurin'
+            java-version: ${{ matrix.java }}
+
         - uses: astral-sh/setup-uv@v3
         - run: |
             uv python install 3.13t
@@ -46,11 +51,6 @@ jobs:
             uv pip install pip
             echo PATH=$PATH >> $GITHUB_ENV
 
-        - uses: actions/setup-java@v4
-          with:
-            distribution: 'temurin'
-            java-version: ${{ matrix.java }}
-
         - run: pip install "setuptools < 72"
 
         - name: Run Free-threaded Test