CHANGE IN BUILD.YAML TO MAKE IT COMPATIBLE WITH SCIJAVA-SCRIPTS

clEsperanto · Sep 4, 2024 · 1ce2fd5 · 1ce2fd5
1 parent 9fe9a2d
commit 1ce2fd5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -31,7 +31,7 @@ jobs:
             cmake-build-type: "Release"
             cmake-build-flag: "-A x64"
           - name: macos
-            os: macos-13
+            os: macos-latest
             c-compiler: "clang"
             cxx-compiler: "clang++"
             cmake-build-type: "Release"
@@ -108,7 +108,7 @@ jobs:
 
   create-jar:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
@@ -120,7 +120,7 @@ jobs:
       uses: actions/download-artifact@v4
     - name: understand what is downlaoded
       run: ls
-    - name: Get Maven Version and Upload Artifact
+    - name: Get Maven Version
       run: |
         MVN_VERSION=$(mvn -q \
           -Dexec.executable=echo \
@@ -135,18 +135,17 @@ jobs:
         echo "version=${MVN_VERSION}" >> $GITHUB_OUTPUT
         echo "name=${MVN_NAME}" >> $GITHUB_OUTPUT
       id: mvn_info
-    # There is no specific reason to select the JAR file containing the macos dynamic libraries as the final one, we could have selected any other
-    - name: Select one of the JARs as the JAR to be the final
-      run: |
-        mv macos-artifact/${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar ${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar
-    - name: Add Linux and Windows dynamic libraries
+    - name: Extract compiled native libraries to target fodler libs
       run: |
-        jar xf ubuntu-artifact/${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar net/clesperanto/linux-x86_64
-        jar xf windows-artifact/${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar net/clesperanto/windows-x86_64
-        jar uf ${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar -C . net/clesperanto
+        mkdir -p libs
+        jar xf ubuntu-artifact/${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar libs/net/clesperanto/linux-x86_64
+        jar xf windows-artifact/${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar libs/net/clesperanto/windows-x86_64
+        jar xf macos-artifact/${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar libs/net/clesperanto/macos-arm64
 
+    - name: Build the JAR file for macos-x86_64 and adding all the native libraries to it
+      run: mvn clean install
     - name: Upload final JAR
       uses: actions/upload-artifact@v4
       with:
         name: final-jar
-        path: ${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar
+        path: target/${{steps.mvn_info.outputs.name}}-${{steps.mvn_info.outputs.version}}.jar
diff --git a/macos-x86_64.zip b/macos-x86_64.zip
diff --git a/pom.xml b/pom.xml
@@ -361,7 +361,28 @@
 	                <reuseForks>false</reuseForks>
 			    </configuration>
             </plugin>
-
+            <plugin>
+		        <artifactId>maven-resources-plugin</artifactId>
+		        <executions>
+		          <execution>
+		            <id>copy</id>
+		            <!-- here the phase you need -->
+		            <phase>validate</phase>
+		            <goals>
+		              <goal>copy-resources</goal>
+		            </goals>
+		            <configuration>
+		              <outputDirectory>${project.basedir}/target/classes/net/clesperanto</outputDirectory>
+		              <resources>          
+		                <resource>
+		                  <directory>${project.basedir}/libs</directory>
+		                  <filtering>false</filtering>
+		                </resource>
+		              </resources>              
+		            </configuration>            
+		          </execution>
+		        </executions>
+      		</plugin>
 		</plugins>
 	</build>