From f3b3daab105a05be33bf8cfd88ffcc9edd5da0fd Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Thu, 16 Jun 2022 09:10:00 -0600 Subject: [PATCH 1/3] global_settings: Add extra error handling for defaults removal --- resources/global_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/global_settings.py b/resources/global_settings.py index aca867eb4..d19dcb930 100644 --- a/resources/global_settings.py +++ b/resources/global_settings.py @@ -56,4 +56,7 @@ class global_settings: return # delete defaults plist - Path(defaults_path).unlink() \ No newline at end of file + try: + Path(defaults_path).unlink() + except PermissionError: + print("- Permission error: Unable to delete defaults plist") \ No newline at end of file From 506cb009377d3c3ba5639ce631e85bf04c9ab3ef Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Thu, 16 Jun 2022 09:17:22 -0600 Subject: [PATCH 2/3] =?UTF-8?q?CI:=20Don=E2=80=99t=20publish=20TUIs=20on?= =?UTF-8?q?=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-app.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index 903c59ece..3e00fb673 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -26,13 +26,5 @@ jobs: name: OpenCore-Patcher-TUI.app path: OpenCore-Patcher-TUI.app.zip - - name: Upload to Release - if: github.event_name == 'release' - uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: OpenCore-Patcher-TUI.app.zip - tag: ${{ github.ref }} - file_glob: true - name: Validate OpenCore run: ./dist/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher --validate From 8e9220cbc944ba5afbcddc82b5c65d9ab9b056f6 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Thu, 16 Jun 2022 09:19:45 -0600 Subject: [PATCH 3/3] CI: Adjust TUI parameters --- .github/workflows/build-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index 3e00fb673..69035987c 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -16,7 +16,7 @@ jobs: commitdate: ${{ github.event.head_commit.timestamp }} steps: - uses: actions/checkout@v3 - - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --build_tui --reset_binaries --branch ${{ env.branch }} --commit ${{ env.commiturl }} --commit_date ${{ env.commitdate }} + - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --build_tui --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}" - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "dist/OpenCore-Patcher.app"' - run: cd dist; zip -r ../OpenCore-Patcher-TUI.app.zip OpenCore-Patcher.app - run: ./../sign-tui.sh