From 1ab3bc9e9c692e76789d710ae6db9152464d62c8 Mon Sep 17 00:00:00 2001 From: Dragos Daian Date: Sun, 23 Jul 2023 20:45:04 +0200 Subject: [PATCH] update signing Update macos_builds.yml Update README.md Update README.md update readme add thirdparty.txtf ile update thirdparty update path try sign verify with verbose list files try again to sign using an action this time remove exit update signing Update macos_builds.yml Update macos_builds.yml sign manually upd upd try without timestamp copy license in addons export also try with timestamp again use debug and release target to reduze binary size. disable ios build for now --- .github/actions/upload/action.yml | 7 +- .github/workflows/android_builds.yml | 2 + .github/workflows/ios_builds.yml | 2 + .github/workflows/linux_builds.yml | 2 + .github/workflows/macos_builds.yml | 7 +- .github/workflows/runner.yml | 8 +- .github/workflows/windows_builds.yml | 2 + README.md | 10 ++- THIRDPARTY.txt | 117 +++++++++++++++++++++++++ dist/addons/godot-box2d/LICENSE.txt | 21 +++++ dist/addons/godot-box2d/THIRDPARTY.txt | 117 +++++++++++++++++++++++++ scripts/ci-sign-macos.ps1 | 21 ++++- 12 files changed, 301 insertions(+), 15 deletions(-) create mode 100644 THIRDPARTY.txt create mode 100644 dist/addons/godot-box2d/LICENSE.txt create mode 100644 dist/addons/godot-box2d/THIRDPARTY.txt mode change 100644 => 100755 scripts/ci-sign-macos.ps1 diff --git a/.github/actions/upload/action.yml b/.github/actions/upload/action.yml index 469a5f2..cbeaf4d 100644 --- a/.github/actions/upload/action.yml +++ b/.github/actions/upload/action.yml @@ -1,13 +1,18 @@ name: Physics Server Box2D Upload description: Upload Godot Cpp and the Physics Server 2D Extension. +inputs: + target: + description: Build target (editor, template_release, template_debug). + default: "template_debug" + runs: using: composite steps: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: Physics Server Box2D + name: Godot Box2D - ${{ inputs.target }} path: | ${{ github.workspace }}/dist/** retention-days: 14 diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml index 0fc5d1b..4c2d408 100644 --- a/.github/workflows/android_builds.yml +++ b/.github/workflows/android_builds.yml @@ -36,3 +36,5 @@ jobs: - name: Upload ${{ matrix.target }} ${{ matrix.arch }} uses: ./.github/actions/upload + with: + target: ${{ matrix.target }} diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml index 1871e3b..2679301 100644 --- a/.github/workflows/ios_builds.yml +++ b/.github/workflows/ios_builds.yml @@ -30,3 +30,5 @@ jobs: - name: Upload ${{ matrix.target }} ${{ matrix.arch }} uses: ./.github/actions/upload + with: + target: ${{ matrix.target }} diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 8708766..393eb47 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -31,4 +31,6 @@ jobs: - name: Upload ${{ matrix.target }} ${{ matrix.arch }} uses: ./.github/actions/upload + with: + target: ${{ matrix.target }} diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 0960316..c9e8e4d 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -29,7 +29,7 @@ jobs: arch: ${{ matrix.arch }} platform: macos target: ${{ matrix.target }} - + - name: Sign frameworks shell: pwsh env: @@ -38,8 +38,11 @@ jobs: APPLE_DEV_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }} APPLE_DEV_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }} APPLE_DEV_PASSWORD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }} - run: gci -R ./dist/addons/*.framework | ./scripts/ci-sign-macos.ps1 + APPLE_DEV_APP_ID: ${{ secrets.PROD_MACOS_APPLE_DEV_APP_ID }} + run: gci -R ./dist/*.framework | ./scripts/ci-sign-macos.ps1 if: ${{ env.APPLE_DEV_ID }} - name: Upload ${{ matrix.target }} ${{ matrix.arch }} uses: ./.github/actions/upload + with: + target: ${{ matrix.target }} diff --git a/.github/workflows/runner.yml b/.github/workflows/runner.yml index 7000b86..2c6a2c4 100644 --- a/.github/workflows/runner.yml +++ b/.github/workflows/runner.yml @@ -14,10 +14,10 @@ jobs: needs: static-checks uses: ./.github/workflows/android_builds.yml - ios-build: - name: 🍏 iOS - needs: static-checks - uses: ./.github/workflows/ios_builds.yml + #ios-build: + # name: 🍏 iOS + # needs: static-checks + # uses: ./.github/workflows/ios_builds.yml linux-build: name: 🐧 Linux diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index fa1a061..91c87e0 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -33,4 +33,6 @@ jobs: - name: Upload ${{ matrix.target }} ${{ matrix.arch }} uses: ./.github/actions/upload + with: + target: ${{ matrix.target }} diff --git a/README.md b/README.md index 29af823..a087566 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,13 @@ # Godot Box2D [![🔗 Build Status](https://github.com/godot-box2d/godot-box2d/actions/workflows/runner.yml/badge.svg)](https://github.com/godot-box2d/godot-box2d/actions/workflows/runner.yml) + A [box2D](https://github.com/erincatto/box2d) physics server for [Godot Engine](https://github.com/godotengine/godot) 4.1, implemented as a GDExtension. Based of [rburing/physics_server_box2d](https://github.com/rburing/physics_server_box2d). +Passes 124/150 tests from [Godot-Physics-Tests](https://github.com/godot-box2d/Godot-Physics-Tests). + ## Missing/Not implemented - Skewed shapes @@ -16,7 +19,7 @@ Based of [rburing/physics_server_box2d](https://github.com/rburing/physics_serve - Body pickable - Torque uses wrong values -## Install from binaries +## Install Currently it's built automatically for: @@ -26,9 +29,8 @@ Currently it's built automatically for: - iOS (arm64) - Android (arm64 + x86_64) -Go to any action workflow on this project: [Actions List](https://github.com/rburing/physics_server_box2d/actions) -1. [Download latest release](https://github.com/godot-box2d/godot-box2d/releases/latest) from github job +1. Download from [Github Releases](https://github.com/godot-box2d/godot-box2d/releases/latest) or from [Godot Asset Library](https://godotengine.org/asset-library/asset/8412) 2. Extract the ZIP archive and move the `addons/` folder it contains into your project folder 3. Open your project settings 4. Make sure "Advanced Settings" is enabled @@ -38,7 +40,7 @@ Go to any action workflow on this project: [Actions List](https://github.com/rbu ## Building from source -1. Clone the git repository, including its `box2d` and `godot-cpp` submodules. +1. Clone the git repository, including its submodules. 2. Open a terminal application and change its working directory to the `godot-box2d` git repository. diff --git a/THIRDPARTY.txt b/THIRDPARTY.txt new file mode 100644 index 0000000..3e7a988 --- /dev/null +++ b/THIRDPARTY.txt @@ -0,0 +1,117 @@ +Godot Box2D incorporates third-party material from the projects listed below. + +Godot Engine (https://github.com/godotengine/godot) + + Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). + Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + +godot-cpp (https://github.com/godot-jolt/godot-cpp) + + Copyright (c) 2017-present Godot Engine contributors. + Copyright (c) 2022-present Mikael Hermansson. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + +box2d (https://github.com/erincatto/box2d) + + MIT License + + Copyright (c) 2019 Erin Catto + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +Godot Jolt (https://github.com/godot-jolt/godot-jolt) + + Copyright (c) Mikael Hermansson and Godot Jolt contributors. + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +godot_box2d (https://github.com/briansemrau/godot_box2d) + MIT License + + Copyright (c) 2020 Brian Semrau + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff --git a/dist/addons/godot-box2d/LICENSE.txt b/dist/addons/godot-box2d/LICENSE.txt new file mode 100644 index 0000000..57f6dc5 --- /dev/null +++ b/dist/addons/godot-box2d/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2022-present Ricardo Buring and Dragos Daian + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/dist/addons/godot-box2d/THIRDPARTY.txt b/dist/addons/godot-box2d/THIRDPARTY.txt new file mode 100644 index 0000000..3e7a988 --- /dev/null +++ b/dist/addons/godot-box2d/THIRDPARTY.txt @@ -0,0 +1,117 @@ +Godot Box2D incorporates third-party material from the projects listed below. + +Godot Engine (https://github.com/godotengine/godot) + + Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). + Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + +godot-cpp (https://github.com/godot-jolt/godot-cpp) + + Copyright (c) 2017-present Godot Engine contributors. + Copyright (c) 2022-present Mikael Hermansson. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + +box2d (https://github.com/erincatto/box2d) + + MIT License + + Copyright (c) 2019 Erin Catto + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +Godot Jolt (https://github.com/godot-jolt/godot-jolt) + + Copyright (c) Mikael Hermansson and Godot Jolt contributors. + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +godot_box2d (https://github.com/briansemrau/godot_box2d) + MIT License + + Copyright (c) 2020 Brian Semrau + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff --git a/scripts/ci-sign-macos.ps1 b/scripts/ci-sign-macos.ps1 old mode 100644 new mode 100755 index 6b6592e..2db2de0 --- a/scripts/ci-sign-macos.ps1 +++ b/scripts/ci-sign-macos.ps1 @@ -32,10 +32,12 @@ begin { $DevId = $env:APPLE_DEV_ID $DevTeamId = $env:APPLE_DEV_TEAM_ID $DevPassword = $env:APPLE_DEV_PASSWORD + $DeveloperIdApplication = $env:APPLE_DEV_APP_ID if (!$CertificateBase64) { throw "No certificate provided" } if (!$CertificatePassword) { throw "No certificate password provided" } if (!$DevId) { throw "No Apple Developer ID provided" } + if (!$DeveloperIdApplication) { throw "No Apple Developer ID Application provided" } if (!$DevTeamId) { throw "No Apple Team ID provided" } if (!$DevPassword) { throw "No Apple Developer password provided" } @@ -73,22 +75,33 @@ process { Write-Output "Signing '$Framework'..." - & $CodesignPath --sign "Developer ID" "$Framework" + & $CodesignPath --force --verify --timestamp --verbose --sign $DeveloperIdApplication "$Framework" Write-Output "Verifying signing..." - & $CodesignPath --verify "$Framework" + & $CodesignPath --verify --verbose "$Framework" Write-Output "Archiving framework to '$Archive'..." - ditto -ck "$Framework" "$Archive" + ditto -ck --sequesterRsrc --keepParent "$Framework" "$Archive" Write-Output "Submitting archive for notarization..." - xcrun notarytool submit "$Archive" ` + $output = xcrun notarytool submit "$Archive" ` --apple-id $DevId ` --team-id $DevTeamId ` --password $DevPassword ` --wait + echo $output + $matches = $output -match '((\d|[a-z])+-(\d|[a-z])+-(\d|[a-z])+-(\d|[a-z])+-(\d|[a-z])+)' + if ($output) { + $id_res = $matches[0].Substring(6) + } + xcrun notarytool log $id_res ` + --apple-id $DevId ` + --team-id $DevTeamId ` + --password $DevPassword ` + developer_log.json + get-content developer_log.json } }