diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index 3dbf4ce..38d6eae 100644 --- a/.github/workflows/archive.yml +++ b/.github/workflows/archive.yml @@ -66,6 +66,9 @@ jobs: swift --version echo Release version: ${{ inputs.version }} echo SDK: ${{ matrix.sdk }} + - name: Install xcbeautify + if: ${{ !env.selfhosted && inputs.scheme != '' }} + run: brew install xcbeautify - name: Archive for ${{ matrix.sdk }} SDK run: | xcodebuild archive \ @@ -79,7 +82,8 @@ jobs: ONLY_ACTIVE_ARCH=NO \ CI=TRUE \ VERSION_NUMBER=${{ inputs.version }} \ - SWIFT_OBJC_INTEROP_MODE=${{ (inputs.cxxInterop && 'objcxx') || 'objc' }} + SWIFT_OBJC_INTEROP_MODE=${{ (inputs.cxxInterop && 'objcxx') || 'objc' }} \ + | xcbeautify - name: Package the XCArchive # To preserve symlinks within the XCArchives that are not preserved by the GitHub Actions artifact upload run: | cd .build diff --git a/.github/workflows/xcframework.yml b/.github/workflows/xcframework.yml index 28f0450..3ecf537 100644 --- a/.github/workflows/xcframework.yml +++ b/.github/workflows/xcframework.yml @@ -47,6 +47,11 @@ on: type: string required: false default: '["iphoneos", "iphonesimulator", "macosx", "appletvos", "appletvsimulator", "xros", "xrsimulator", "watchos", "watchsimulator"]' + outputpath: + description: 'Optional Prefix for the output path' + type: string + required: false + default: '.' user: description: 'Optional GitHub username that is associated with the GitHub Personal Access Token (PAT)' type: string @@ -119,7 +124,7 @@ jobs: FRAMEWORKS_ARGS=$(echo "$FRAMEWORKS_ARGS" | xargs) echo "Executing xcodebuild with args: $FRAMEWORKS_ARGS" - xcodebuild -create-xcframework $FRAMEWORKS_ARGS -output ${{ inputs.xcFrameworkName }}.xcframework || { echo "xcodebuild failed"; exit 1; } + xcodebuild -create-xcframework $FRAMEWORKS_ARGS -output ${{ inputs.outputpath }}/${{ inputs.xcFrameworkName }}.xcframework | xcbeautify || { echo "xcodebuild failed"; exit 1; } rm -rf .build - name: Commit and push XCFramework