Merge branch 'release/4.1.0-pre.4'

intelligide · Mar 15, 2023 · 1b8a705 · 1b8a705
2 parents 7a01234 + a71fee1
commit 1b8a705
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 51 deletions.
diff --git a/.github/workflows/package_generation.yml b/.github/workflows/package_generation.yml
@@ -9,9 +9,6 @@ on:
       assimpNetVersion:
         required: true
         type: string
-      packageName:
-        default: 'UnityPackage'
-        type: string
       buildWindows:
         default: true
         type: boolean
@@ -27,9 +24,6 @@ on:
       buildAndroid:
         default: true
         type: boolean
-    outputs:
-      packageName:
-        value: ${{ inputs.packageName }}
 
 jobs:
   build_assimpnet:
@@ -223,7 +217,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        BuildArch: [x86_64]
+        BuildArch: [universal]
     env:
       CFLAGS: -g0
       CXXFLAGS: -g0
@@ -237,15 +231,16 @@ jobs:
 
       - name: Configure Assimp
         run: cmake -G "Unix Makefiles" -S . -B . -DCMAKE_BUILD_TYPE=MinSizeRel -DASSIMP_BUILD_TESTS=OFF
-            -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}
+            -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DBUILD_SHARED_LIBS=ON
+            -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}
         working-directory : assimp-${{ inputs.AssimpVersion }}
 
       - name: Build Assimp
-        run: cmake --build . --config MinSizeRel
+        run: cmake --build . --config MinSizeRel -j 4
         working-directory : assimp-${{ inputs.AssimpVersion }}
 
       - name: Install Assimp
-        run: cmake --build . --target install/strip --config MinSizeRel
+        run: cmake --build . --target install/strip --config MinSizeRel -j 4
         working-directory : assimp-${{ inputs.AssimpVersion }}
 
       - uses: actions/upload-artifact@v3
@@ -344,6 +339,7 @@ jobs:
 
   package_win:
     name: Package for Windows
+    if: inputs.buildWindows
     runs-on: ubuntu-latest
     env:
       ArtifactTemporaryDir: artifacts
@@ -364,11 +360,9 @@ jobs:
           path: ${{ env.ArtifactTemporaryDir }}/Assimp-Win-x86
 
       - name: Install Assimp for Windows x64
-        if: inputs.buildWindows
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Win-x64/assimp.dll packages/${{ env.PackageName }}/Plugins/win/x86_64/assimp.dll
 
       - name: Install Assimp for Windows x86
-        if: inputs.buildWindows
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Win-x86/assimp.dll packages/${{ env.PackageName }}/Plugins/win/x86/assimp.dll
 
       - name: Copy Assimp License
@@ -384,6 +378,7 @@ jobs:
 
   package_linux:
     name: Package for Linux
+    if: inputs.buildLinux
     runs-on: ubuntu-latest
     env:
       ArtifactTemporaryDir: artifacts
@@ -399,7 +394,6 @@ jobs:
           path: ${{ env.ArtifactTemporaryDir }}/Assimp-Linux-x64
 
       - name: Install Assimp for Linux x86_64
-        if: inputs.buildLinux
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Linux-x64/libassimp.so packages/${{ env.PackageName }}/Plugins/linux/x86_64/libassimp.so
 
       - name: Copy Assimp License
@@ -415,6 +409,7 @@ jobs:
 
   package_android:
     name: Package for Android
+    if: inputs.buildAndroid
     runs-on: ubuntu-latest
     env:
       ArtifactTemporaryDir: artifacts
@@ -445,19 +440,15 @@ jobs:
           path: ${{ env.ArtifactTemporaryDir }}/Assimp-Android-x86_64
 
       - name: Install Assimp for Android armv7
-        if: inputs.buildAndroid
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Android-armeabi-v7a/libassimp.so packages/${{ env.PackageName }}/Plugins/android/armv7/libassimp.so
 
       - name: Install Assimp for Android arm64
-        if: inputs.buildAndroid
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Android-arm64-v8a/libassimp.so packages/${{ env.PackageName }}/Plugins/android/arm64/libassimp.so
 
       - name: Install Assimp for Android x86
-        if: inputs.buildAndroid
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Android-x86/libassimp.so packages/${{ env.PackageName }}/Plugins/android/x86/libassimp.so
 
       - name: Install Assimp for Android x86_64
-        if: inputs.buildAndroid
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Android-x86_64/libassimp.so packages/${{ env.PackageName }}/Plugins/android/x86_64/libassimp.so
 
       - name: Copy Assimp License
@@ -473,6 +464,7 @@ jobs:
 
   package_macos:
     name: Package for macOS
+    if: inputs.buildmacOS
     runs-on: ubuntu-latest
     env:
       ArtifactTemporaryDir: artifacts
@@ -484,15 +476,14 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: Assimp-macOS-x86_64
-          path: ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-x86_64
+          name: Assimp-macOS-universal
+          path: ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-universal
 
-      - name: Install Assimp for Mac OS X x86_64
-        if: inputs.buildmacOS
-        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-x86_64/libassimp.dylib packages/${{ env.PackageName }}/Plugins/osx/x86_64/libassimp.dylib
+      - name: Install Assimp for Mac OS X Universal
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-universal/libassimp.dylib packages/${{ env.PackageName }}/Plugins/osx/x86_64/libassimp.dylib
 
       - name: Copy Assimp License
-        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-x86_64/LICENSE packages/${{ env.PackageName }}/AssimpLicense.txt
+        run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-universal/LICENSE packages/${{ env.PackageName }}/AssimpLicense.txt
 
       - name: Delete gitkeep files
         run: find packages/${{ env.PackageName }} -name '.gitkeep' -delete
@@ -504,6 +495,7 @@ jobs:
 
   package_ios:
     name: Package for iOS
+    if: inputs.buildiOS
     runs-on: ubuntu-latest
     env:
       ArtifactTemporaryDir: artifacts
@@ -524,27 +516,21 @@ jobs:
           path: ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64
 
       - name: Install Assimp for iOS arm64
-        if: inputs.buildiOS
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/iOS/arm64/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libassimp.a
 
       - name: Install Assimp for iOS arm64
-        if: inputs.buildiOS
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/libIrrXML.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libIrrXML.a
 
       - name: Install Assimp for iOS arm64
-        if: inputs.buildiOS
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/libzlibstatic.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libzlibstatic.a
 
       - name: Install Assimp for iOS x86_64
-        if: inputs.buildiOS
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/iOS/x86_64/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/x64/libassimp.a
 
       - name: Install Assimp for iOS x86_64
-        if: inputs.buildiOS
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/libIrrXML.a packages/${{ env.PackageName }}/Plugins/ios/x64/libIrrXML.a
 
       - name: Install Assimp for iOS x86_64
-        if: inputs.buildiOS
         run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/libzlibstatic.a packages/${{ env.PackageName }}/Plugins/ios/x64/libzlibstatic.a
 
       - name: Copy Assimp License

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -73,12 +73,12 @@ jobs:
         with:
           path: packages
 
-      - run: tar -czvf com.frozenstorminteractive.assimp.tar.gz packages/com.frozenstorminteractive.assimp
-      - run: tar -czvf com.frozenstorminteractive.assimp.android.tar.gz packages/com.frozenstorminteractive.assimp.android
-      - run: tar -czvf com.frozenstorminteractive.assimp.ios.tar.gz packages/com.frozenstorminteractive.assimp.ios
-      - run: tar -czvf com.frozenstorminteractive.assimp.linux.tar.gz packages/com.frozenstorminteractive.assimp.linux
-      - run: tar -czvf com.frozenstorminteractive.assimp.macos.tar.gz packages/com.frozenstorminteractive.assimp.macos
-      - run: tar -czvf com.frozenstorminteractive.assimp.windows.tar.gz packages/com.frozenstorminteractive.assimp.windows
+      - run: tar -C packages/com.frozenstorminteractive.assimp -czvf com.frozenstorminteractive.assimp.tar.gz . --transform s/^./package/
+      - run: tar -C packages/com.frozenstorminteractive.assimp.android -czvf com.frozenstorminteractive.assimp.android.tar.gz . --transform s/^./package/
+      - run: tar -C packages/com.frozenstorminteractive.assimp.ios -czvf com.frozenstorminteractive.assimp.ios.tar.gz . --transform s/^./package/
+      - run: tar -C packages/com.frozenstorminteractive.assimp.linux -czvf com.frozenstorminteractive.assimp.linux.tar.gz . --transform s/^./package/
+      - run: tar -C packages/com.frozenstorminteractive.assimp.macos -czvf com.frozenstorminteractive.assimp.macos.tar.gz . --transform s/^./package/
+      - run: tar -C packages/com.frozenstorminteractive.assimp.windows -czvf com.frozenstorminteractive.assimp.windows.tar.gz . --transform s/^./package/
 
       - name: Upload artifacts
         uses: softprops/action-gh-release@v1

diff --git a/TestProjects/Assimp_URP_Tests/Packages/packages-lock.json b/TestProjects/Assimp_URP_Tests/Packages/packages-lock.json
@@ -11,39 +11,39 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
       }
     },
     "com.frozenstorminteractive.assimp.ios": {
       "version": "file:../../../packages/com.frozenstorminteractive.assimp.ios",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
       }
     },
     "com.frozenstorminteractive.assimp.linux": {
       "version": "file:../../../packages/com.frozenstorminteractive.assimp.linux",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
       }
     },
     "com.frozenstorminteractive.assimp.macos": {
       "version": "file:../../../packages/com.frozenstorminteractive.assimp.macos",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
       }
     },
     "com.frozenstorminteractive.assimp.windows": {
       "version": "file:../../../packages/com.frozenstorminteractive.assimp.windows",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+        "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
       }
     },
     "com.unity.burst": {

diff --git a/packages/com.frozenstorminteractive.assimp.android/package.json b/packages/com.frozenstorminteractive.assimp.android/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.frozenstorminteractive.assimp.android",
-  "version": "4.1.0-pre.3",
+  "version": "4.1.0-pre.4",
   "displayName": "Assimp - Android",
   "unity": "2018.1",
   "description": "Assimp binaries for Android",
@@ -23,6 +23,6 @@
     "url" : "https://www.frozenstorminteractive.com"
   },
   "dependencies": {
-    "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+    "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
   }
 }
diff --git a/packages/com.frozenstorminteractive.assimp.ios/package.json b/packages/com.frozenstorminteractive.assimp.ios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.frozenstorminteractive.assimp.ios",
-  "version": "4.1.0-pre.3",
+  "version": "4.1.0-pre.4",
   "displayName": "Assimp - iOS",
   "unity": "2018.1",
   "description": "Assimp binaries for iOS",
@@ -23,6 +23,6 @@
     "url" : "https://www.frozenstorminteractive.com"
   },
   "dependencies": {
-    "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+    "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
   }
 }
diff --git a/packages/com.frozenstorminteractive.assimp.linux/package.json b/packages/com.frozenstorminteractive.assimp.linux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.frozenstorminteractive.assimp.linux",
-  "version": "4.1.0-pre.3",
+  "version": "4.1.0-pre.4",
   "displayName": "Assimp - Linux",
   "unity": "2018.1",
   "description": "Assimp binaries for Linux",
@@ -23,6 +23,6 @@
     "url" : "https://www.frozenstorminteractive.com"
   },
   "dependencies": {
-    "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+    "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
   }
 }
diff --git a/packages/com.frozenstorminteractive.assimp.macos/package.json b/packages/com.frozenstorminteractive.assimp.macos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.frozenstorminteractive.assimp.macos",
-  "version": "4.1.0-pre.3",
+  "version": "4.1.0-pre.4",
   "displayName": "Assimp - macOS",
   "unity": "2018.1",
   "description": "Assimp binaries for macOS",
@@ -23,6 +23,6 @@
     "url" : "https://www.frozenstorminteractive.com"
   },
   "dependencies": {
-    "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+    "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
   }
 }
diff --git a/packages/com.frozenstorminteractive.assimp.windows/package.json b/packages/com.frozenstorminteractive.assimp.windows/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.frozenstorminteractive.assimp.windows",
-  "version": "4.1.0-pre.3",
+  "version": "4.1.0-pre.4",
   "displayName": "Assimp - Windows",
   "unity": "2018.1",
   "description": "Assimp binaries for Windows",
@@ -23,6 +23,6 @@
     "url" : "https://www.frozenstorminteractive.com"
   },
   "dependencies": {
-    "com.frozenstorminteractive.assimp": "4.1.0-pre.3"
+    "com.frozenstorminteractive.assimp": "4.1.0-pre.4"
   }
 }
diff --git a/packages/com.frozenstorminteractive.assimp/package.json b/packages/com.frozenstorminteractive.assimp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.frozenstorminteractive.assimp",
-  "version": "4.1.0-pre.3",
+  "version": "4.1.0-pre.4",
   "displayName": "Assimp",
   "unity": "2018.1",
   "description": "Assimp for Unity",