Update builds for HDF5 and Hyperscan

bytedeco · Jun 29, 2023 · 195669c · 195669c
1 parent cb80fd6
commit 195669c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 28 deletions.
diff --git 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
@@ -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
@@ -48,12 +48,12 @@
       <artifactId>${javacpp.moduleId}</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>${javacpp.moduleId}</artifactId>
-      <version>${project.version}</version>
-      <classifier>${javacpp.platform.linux-x86}</classifier>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>${project.groupId}</groupId>-->
+<!--      <artifactId>${javacpp.moduleId}</artifactId>-->
+<!--      <version>${project.version}</version>-->
+<!--      <classifier>${javacpp.platform.linux-x86}</classifier>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>${javacpp.moduleId}</artifactId>
@@ -66,12 +66,12 @@
       <version>${project.version}</version>
       <classifier>${javacpp.platform.macosx-x86_64}</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>${javacpp.moduleId}</artifactId>
-      <version>${project.version}</version>
-      <classifier>${javacpp.platform.windows-x86}</classifier>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>${project.groupId}</groupId>-->
+<!--      <artifactId>${javacpp.moduleId}</artifactId>-->
+<!--      <version>${project.version}</version>-->
+<!--      <classifier>${javacpp.platform.windows-x86}</classifier>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>${javacpp.moduleId}</artifactId>
@@ -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;
                     }
                   </moduleInfoSource>