diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ebfdf01..44e7e7a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: - os: macos-latest build_args: release ios build_target: ios - artifact_name: build/Release/ios/libveldrid-spirv.xcframework + artifact_name: build/Release/ios/libveldrid-spirv.xcframework.zip name: ${{ matrix.build_target }} Native Build steps: @@ -71,6 +71,10 @@ jobs: fi shell: bash + - name: Compress Framework For Upload + if: ${{ matrix.build_target == 'ios' }} + run: zip -r ${{ matrix.artifact_name }} build/Release/ios/libveldrid-spirv.xcframework + # We can only run per-platform tests on 64-bit architectures # https://github.com/actions/setup-dotnet/issues/72 - name: Install .NET @@ -151,6 +155,14 @@ jobs: name: ios path: build/Release/ios + - name: Uncompress ios archive + uses: montudor/action-zip@v1 + with: + args: unzip -qq build/Release/ios/veldrid-spirv.xcframework.zip -d build/Release/ios/veldrid-spirv.xcframework + + - name: List + run: ls; ls ./build; ls ./build/Release; ls ./build/Release/ios; ls ./build/Release/ios/veldrid-spirv.xcframework + - name: Install .NET uses: actions/setup-dotnet@v1 with: diff --git a/build-native.sh b/build-native.sh index 51fac4d..712b39f 100755 --- a/build-native.sh +++ b/build-native.sh @@ -72,7 +72,7 @@ if [[ $_OSDir == "ios" ]]; then popd - xcodebuild -create-xcframework -framework ./device/Release-iphoneos/veldrid-spirv.framework -framework ./simulator/Release-iphonesimulator/veldrid-spirv.framework -output ./veldrid-spirv.xcframework + xcodebuild -create-xcframework -framework ./device-build/Release-iphoneos/veldrid-spirv.framework -framework ./simulator-build/Release-iphonesimulator/veldrid-spirv.framework -output ./veldrid-spirv.xcframework else cmake ../../.. -DCMAKE_BUILD_TYPE=$_CMakeBuildType $_CMakeGenerator $_CMakeEnableBitcode -DPYTHON_EXECUTABLE=$_PythonExePath -DCMAKE_OSX_ARCHITECTURES="$_CMakeOsxArchitectures" cmake --build . --target $_CMakeBuildTarget $_CMakeExtraBuildArgs