Skip to content

Commit 1b8a705

Browse files
intelligideintelligide
committed
Merge branch 'release/4.1.0-pre.4'
2 parents 7a01234 + a71fee1 commit 1b8a705

9 files changed

Lines changed: 37 additions & 51 deletions

File tree

‎.github/workflows/package_generation.yml‎

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
assimpNetVersion:
1010
required: true
1111
type: string
12-
packageName:
13-
default: 'UnityPackage'
14-
type: string
1512
buildWindows:
1613
default: true
1714
type: boolean
@@ -27,9 +24,6 @@ on:
2724
buildAndroid:
2825
default: true
2926
type: boolean
30-
outputs:
31-
packageName:
32-
value: ${{ inputs.packageName }}
3327

3428
jobs:
3529
build_assimpnet:
@@ -223,7 +217,7 @@ jobs:
223217
strategy:
224218
fail-fast: false
225219
matrix:
226-
BuildArch: [x86_64]
220+
BuildArch: [universal]
227221
env:
228222
CFLAGS: -g0
229223
CXXFLAGS: -g0
@@ -237,15 +231,16 @@ jobs:
237231

238232
- name: Configure Assimp
239233
run: cmake -G "Unix Makefiles" -S . -B . -DCMAKE_BUILD_TYPE=MinSizeRel -DASSIMP_BUILD_TESTS=OFF
240-
-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}
234+
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DBUILD_SHARED_LIBS=ON
235+
-DCMAKE_INSTALL_PREFIX=${{ runner.temp }}
241236
working-directory : assimp-${{ inputs.AssimpVersion }}
242237

243238
- name: Build Assimp
244-
run: cmake --build . --config MinSizeRel
239+
run: cmake --build . --config MinSizeRel -j 4
245240
working-directory : assimp-${{ inputs.AssimpVersion }}
246241

247242
- name: Install Assimp
248-
run: cmake --build . --target install/strip --config MinSizeRel
243+
run: cmake --build . --target install/strip --config MinSizeRel -j 4
249244
working-directory : assimp-${{ inputs.AssimpVersion }}
250245

251246
- uses: actions/upload-artifact@v3
@@ -344,6 +339,7 @@ jobs:
344339

345340
package_win:
346341
name: Package for Windows
342+
if: inputs.buildWindows
347343
runs-on: ubuntu-latest
348344
env:
349345
ArtifactTemporaryDir: artifacts
@@ -364,11 +360,9 @@ jobs:
364360
path: ${{ env.ArtifactTemporaryDir }}/Assimp-Win-x86
365361

366362
- name: Install Assimp for Windows x64
367-
if: inputs.buildWindows
368363
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Win-x64/assimp.dll packages/${{ env.PackageName }}/Plugins/win/x86_64/assimp.dll
369364

370365
- name: Install Assimp for Windows x86
371-
if: inputs.buildWindows
372366
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Win-x86/assimp.dll packages/${{ env.PackageName }}/Plugins/win/x86/assimp.dll
373367

374368
- name: Copy Assimp License
@@ -384,6 +378,7 @@ jobs:
384378

385379
package_linux:
386380
name: Package for Linux
381+
if: inputs.buildLinux
387382
runs-on: ubuntu-latest
388383
env:
389384
ArtifactTemporaryDir: artifacts
@@ -399,7 +394,6 @@ jobs:
399394
path: ${{ env.ArtifactTemporaryDir }}/Assimp-Linux-x64
400395

401396
- name: Install Assimp for Linux x86_64
402-
if: inputs.buildLinux
403397
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Linux-x64/libassimp.so packages/${{ env.PackageName }}/Plugins/linux/x86_64/libassimp.so
404398

405399
- name: Copy Assimp License
@@ -415,6 +409,7 @@ jobs:
415409

416410
package_android:
417411
name: Package for Android
412+
if: inputs.buildAndroid
418413
runs-on: ubuntu-latest
419414
env:
420415
ArtifactTemporaryDir: artifacts
@@ -445,19 +440,15 @@ jobs:
445440
path: ${{ env.ArtifactTemporaryDir }}/Assimp-Android-x86_64
446441

447442
- name: Install Assimp for Android armv7
448-
if: inputs.buildAndroid
449443
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Android-armeabi-v7a/libassimp.so packages/${{ env.PackageName }}/Plugins/android/armv7/libassimp.so
450444

451445
- name: Install Assimp for Android arm64
452-
if: inputs.buildAndroid
453446
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Android-arm64-v8a/libassimp.so packages/${{ env.PackageName }}/Plugins/android/arm64/libassimp.so
454447

455448
- name: Install Assimp for Android x86
456-
if: inputs.buildAndroid
457449
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Android-x86/libassimp.so packages/${{ env.PackageName }}/Plugins/android/x86/libassimp.so
458450

459451
- name: Install Assimp for Android x86_64
460-
if: inputs.buildAndroid
461452
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-Android-x86_64/libassimp.so packages/${{ env.PackageName }}/Plugins/android/x86_64/libassimp.so
462453

463454
- name: Copy Assimp License
@@ -473,6 +464,7 @@ jobs:
473464

474465
package_macos:
475466
name: Package for macOS
467+
if: inputs.buildmacOS
476468
runs-on: ubuntu-latest
477469
env:
478470
ArtifactTemporaryDir: artifacts
@@ -484,15 +476,14 @@ jobs:
484476

485477
- uses: actions/download-artifact@v3
486478
with:
487-
name: Assimp-macOS-x86_64
488-
path: ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-x86_64
479+
name: Assimp-macOS-universal
480+
path: ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-universal
489481

490-
- name: Install Assimp for Mac OS X x86_64
491-
if: inputs.buildmacOS
492-
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-x86_64/libassimp.dylib packages/${{ env.PackageName }}/Plugins/osx/x86_64/libassimp.dylib
482+
- name: Install Assimp for Mac OS X Universal
483+
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-universal/libassimp.dylib packages/${{ env.PackageName }}/Plugins/osx/x86_64/libassimp.dylib
493484

494485
- name: Copy Assimp License
495-
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-x86_64/LICENSE packages/${{ env.PackageName }}/AssimpLicense.txt
486+
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-macOS-universal/LICENSE packages/${{ env.PackageName }}/AssimpLicense.txt
496487

497488
- name: Delete gitkeep files
498489
run: find packages/${{ env.PackageName }} -name '.gitkeep' -delete
@@ -504,6 +495,7 @@ jobs:
504495

505496
package_ios:
506497
name: Package for iOS
498+
if: inputs.buildiOS
507499
runs-on: ubuntu-latest
508500
env:
509501
ArtifactTemporaryDir: artifacts
@@ -524,27 +516,21 @@ jobs:
524516
path: ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64
525517

526518
- name: Install Assimp for iOS arm64
527-
if: inputs.buildiOS
528519
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/iOS/arm64/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libassimp.a
529520

530521
- name: Install Assimp for iOS arm64
531-
if: inputs.buildiOS
532522
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/libIrrXML.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libIrrXML.a
533523

534524
- name: Install Assimp for iOS arm64
535-
if: inputs.buildiOS
536525
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-arm64/libzlibstatic.a packages/${{ env.PackageName }}/Plugins/ios/arm64/libzlibstatic.a
537526

538527
- name: Install Assimp for iOS x86_64
539-
if: inputs.buildiOS
540528
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/iOS/x86_64/libassimp.a packages/${{ env.PackageName }}/Plugins/ios/x64/libassimp.a
541529

542530
- name: Install Assimp for iOS x86_64
543-
if: inputs.buildiOS
544531
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/libIrrXML.a packages/${{ env.PackageName }}/Plugins/ios/x64/libIrrXML.a
545532

546533
- name: Install Assimp for iOS x86_64
547-
if: inputs.buildiOS
548534
run: cp -f ${{ env.ArtifactTemporaryDir }}/Assimp-iOS-x86_64/libzlibstatic.a packages/${{ env.PackageName }}/Plugins/ios/x64/libzlibstatic.a
549535

550536
- name: Copy Assimp License

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ jobs:
7373
with:
7474
path: packages
7575

76-
- run: tar -czvf com.frozenstorminteractive.assimp.tar.gz packages/com.frozenstorminteractive.assimp
77-
- run: tar -czvf com.frozenstorminteractive.assimp.android.tar.gz packages/com.frozenstorminteractive.assimp.android
78-
- run: tar -czvf com.frozenstorminteractive.assimp.ios.tar.gz packages/com.frozenstorminteractive.assimp.ios
79-
- run: tar -czvf com.frozenstorminteractive.assimp.linux.tar.gz packages/com.frozenstorminteractive.assimp.linux
80-
- run: tar -czvf com.frozenstorminteractive.assimp.macos.tar.gz packages/com.frozenstorminteractive.assimp.macos
81-
- run: tar -czvf com.frozenstorminteractive.assimp.windows.tar.gz packages/com.frozenstorminteractive.assimp.windows
76+
- run: tar -C packages/com.frozenstorminteractive.assimp -czvf com.frozenstorminteractive.assimp.tar.gz . --transform s/^./package/
77+
- run: tar -C packages/com.frozenstorminteractive.assimp.android -czvf com.frozenstorminteractive.assimp.android.tar.gz . --transform s/^./package/
78+
- run: tar -C packages/com.frozenstorminteractive.assimp.ios -czvf com.frozenstorminteractive.assimp.ios.tar.gz . --transform s/^./package/
79+
- run: tar -C packages/com.frozenstorminteractive.assimp.linux -czvf com.frozenstorminteractive.assimp.linux.tar.gz . --transform s/^./package/
80+
- run: tar -C packages/com.frozenstorminteractive.assimp.macos -czvf com.frozenstorminteractive.assimp.macos.tar.gz . --transform s/^./package/
81+
- run: tar -C packages/com.frozenstorminteractive.assimp.windows -czvf com.frozenstorminteractive.assimp.windows.tar.gz . --transform s/^./package/
8282

8383
- name: Upload artifacts
8484
uses: softprops/action-gh-release@v1

‎TestProjects/Assimp_URP_Tests/Packages/packages-lock.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@
1111
"depth": 0,
1212
"source": "local",
1313
"dependencies": {
14-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
14+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
1515
}
1616
},
1717
"com.frozenstorminteractive.assimp.ios": {
1818
"version": "file:../../../packages/com.frozenstorminteractive.assimp.ios",
1919
"depth": 0,
2020
"source": "local",
2121
"dependencies": {
22-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
22+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
2323
}
2424
},
2525
"com.frozenstorminteractive.assimp.linux": {
2626
"version": "file:../../../packages/com.frozenstorminteractive.assimp.linux",
2727
"depth": 0,
2828
"source": "local",
2929
"dependencies": {
30-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
30+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
3131
}
3232
},
3333
"com.frozenstorminteractive.assimp.macos": {
3434
"version": "file:../../../packages/com.frozenstorminteractive.assimp.macos",
3535
"depth": 0,
3636
"source": "local",
3737
"dependencies": {
38-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
38+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
3939
}
4040
},
4141
"com.frozenstorminteractive.assimp.windows": {
4242
"version": "file:../../../packages/com.frozenstorminteractive.assimp.windows",
4343
"depth": 0,
4444
"source": "local",
4545
"dependencies": {
46-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
46+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
4747
}
4848
},
4949
"com.unity.burst": {

‎packages/com.frozenstorminteractive.assimp.android/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.frozenstorminteractive.assimp.android",
3-
"version": "4.1.0-pre.3",
3+
"version": "4.1.0-pre.4",
44
"displayName": "Assimp - Android",
55
"unity": "2018.1",
66
"description": "Assimp binaries for Android",
@@ -23,6 +23,6 @@
2323
"url" : "https://www.frozenstorminteractive.com"
2424
},
2525
"dependencies": {
26-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
26+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
2727
}
2828
}

‎packages/com.frozenstorminteractive.assimp.ios/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.frozenstorminteractive.assimp.ios",
3-
"version": "4.1.0-pre.3",
3+
"version": "4.1.0-pre.4",
44
"displayName": "Assimp - iOS",
55
"unity": "2018.1",
66
"description": "Assimp binaries for iOS",
@@ -23,6 +23,6 @@
2323
"url" : "https://www.frozenstorminteractive.com"
2424
},
2525
"dependencies": {
26-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
26+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
2727
}
2828
}

‎packages/com.frozenstorminteractive.assimp.linux/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.frozenstorminteractive.assimp.linux",
3-
"version": "4.1.0-pre.3",
3+
"version": "4.1.0-pre.4",
44
"displayName": "Assimp - Linux",
55
"unity": "2018.1",
66
"description": "Assimp binaries for Linux",
@@ -23,6 +23,6 @@
2323
"url" : "https://www.frozenstorminteractive.com"
2424
},
2525
"dependencies": {
26-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
26+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
2727
}
2828
}

‎packages/com.frozenstorminteractive.assimp.macos/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.frozenstorminteractive.assimp.macos",
3-
"version": "4.1.0-pre.3",
3+
"version": "4.1.0-pre.4",
44
"displayName": "Assimp - macOS",
55
"unity": "2018.1",
66
"description": "Assimp binaries for macOS",
@@ -23,6 +23,6 @@
2323
"url" : "https://www.frozenstorminteractive.com"
2424
},
2525
"dependencies": {
26-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
26+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
2727
}
2828
}

‎packages/com.frozenstorminteractive.assimp.windows/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.frozenstorminteractive.assimp.windows",
3-
"version": "4.1.0-pre.3",
3+
"version": "4.1.0-pre.4",
44
"displayName": "Assimp - Windows",
55
"unity": "2018.1",
66
"description": "Assimp binaries for Windows",
@@ -23,6 +23,6 @@
2323
"url" : "https://www.frozenstorminteractive.com"
2424
},
2525
"dependencies": {
26-
"com.frozenstorminteractive.assimp": "4.1.0-pre.3"
26+
"com.frozenstorminteractive.assimp": "4.1.0-pre.4"
2727
}
2828
}

‎packages/com.frozenstorminteractive.assimp/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.frozenstorminteractive.assimp",
3-
"version": "4.1.0-pre.3",
3+
"version": "4.1.0-pre.4",
44
"displayName": "Assimp",
55
"unity": "2018.1",
66
"description": "Assimp for Unity",

0 commit comments

Comments
 (0)