diff --git a/.github/workflows/hdf5.yml b/.github/workflows/hdf5.yml index df3e93d6173..6b6ae50af9e 100644 --- a/.github/workflows/hdf5.yml +++ b/.github/workflows/hdf5.yml @@ -32,30 +32,28 @@ jobs: # container: ubuntu:bionic # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions - linux-x86: - runs-on: ubuntu-20.04 - container: centos:7 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions +# linux-x86: +# runs-on: ubuntu-20.04 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions - windows-x86: - runs-on: windows-2019 - steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions +# windows-x86: +# runs-on: windows-2019 +# steps: +# - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions windows-x86_64: runs-on: windows-2019 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-x86_64, macosx-x86_64, windows-x86_64] # needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/hyperscan.yml b/.github/workflows/hyperscan.yml index ea7d35c228d..b21a3e2a031 100644 --- a/.github/workflows/hyperscan.yml +++ b/.github/workflows/hyperscan.yml @@ -19,9 +19,8 @@ env: jobs: linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 steps: - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: runs-on: macos-11 steps: diff --git a/hdf5/platform/pom.xml b/hdf5/platform/pom.xml index 3e8be9374e3..d7106c7cb1f 100644 --- a/hdf5/platform/pom.xml +++ b/hdf5/platform/pom.xml @@ -48,12 +48,12 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -66,12 +66,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -138,10 +138,10 @@ // requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; // requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; // requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; }