GA: Clean up build scripts

.github/workflows/build-app-wxpython-offline.yml

@@ -0,0 +1,43 @@
+name: CI - Build wxPython
+
+on:
+  push:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+name: CI - Build Offline wxPython
+
+on:
+  push:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Build wxPython Offline
+    runs-on: x86_64_mojave
+    steps:
+      - uses: actions/checkout@v2
+      - run: python3 create_offline_build.py
+      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/pyinstaller OpenCore-Patcher-GUI.spec
+      - 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-wxPython.app.zip OpenCore-Patcher.app
+      - run: ./../sign-wxpython.sh
+      - name: Upload App to Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenCore-Patcher.app (GUI Offline, macOS 10.13 and newer)
+          path: OpenCore-Patcher-wxPython.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-wxPython.app.zip
+          tag: ${{ github.ref }}
+          file_glob: true
+          asset_name: OpenCore-Patcher.app (GUI Offline, macOS 10.13 and newer)
+      - name: Validate OpenCore
+        run: ./OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher --validate

.github/workflows/build-app-wxpython.yml

@@ -24,12 +24,12 @@ jobs:
       - name: Upload App to Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: OpenCore-Patcher-wxPython.app (macOS 10.13 and newer)
+          name: OpenCore-Patcher.app (GUI, macOS 10.13 and newer)
           path: OpenCore-Patcher-wxPython.app.zip
       - name: Upload Legacy App to Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: OpenCore-Patcher-wxPython.app (macOS 10.12 and older)
+          name: OpenCore-Patcher.app (GUI, macOS 10.12 and older)
           path: OpenCore-Patcher-wxPython-Legacy.app.zip
 
       - name: Upload to Release
@@ -40,7 +40,7 @@ jobs:
           file: OpenCore-Patcher-wxPython.app.zip
           tag: ${{ github.ref }}
           file_glob: true
-          asset_name: OpenCore-Patcher-wxPython.app (macOS 10.13 and newer)
+          asset_name: OpenCore-Patcher.app (GUI, macOS 10.13 and newer)
       
       - name: Upload Legacy to Release
         if: github.event_name == 'release'
@@ -50,4 +50,4 @@ jobs:
           file: OpenCore-Patcher-wxPython-Legacy.app.zip
           tag: ${{ github.ref }}
           file_glob: true
-          asset_name: OpenCore-Patcher-wxPython.app (macOS 10.12 and older)
+          asset_name: OpenCore-Patcher.app (GUI, macOS 10.12 and older)

.github/workflows/build-gui.yml

@@ -1,52 +0,0 @@
-name: CI - Build GUI
-
-on:
-  push:
-  workflow_dispatch:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    name: Build GUI
-    runs-on: x86_64_mojave
-    steps:
-      - uses: actions/checkout@v2
-
-      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/pyinstaller OpenCore-Patcher.spec
-      - run: cd dist; cp OpenCore-Patcher ../; cd ..; mv OpenCore-Patcher OCLP-CLI
-      - name: Download latest nightly OCLP-GUI
-        run: curl -S -L https://nightly.link/dortania/OCLP-GUI/workflows/build-app/master/OpenCore-Patcher-GUI.app.zip --output ./OpenCore-Patcher-GUI.app.zip --insecure
-      - run: unzip -o OpenCore-Patcher-GUI.app.zip
-      - run: unzip OpenCore-Patcher-GUI.app.zip; rm OpenCore-Patcher-GUI.app.zip
-      - name: Merge new GUI
-        run: cp OCLP-CLI OpenCore\ Patcher.app/Contents/Resources/
-      - run: python3 merge_gui.py
-      - name: Code Sign Binaries
-        run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "OpenCore Patcher.app/Contents/Resources/OCLP-CLI"'
-      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "OpenCore Patcher.app/Contents/Resources/oclpd"'
-      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "OpenCore Patcher.app"'
-      - run: ditto -c -k --sequesterRsrc --keepParent OpenCore\ Patcher.app OpenCore-Patcher-GUI.app.zip
-      - name: Notarize Binaries for release
-        if: github.event_name == 'release'
-        run: ./../sign-gui.sh
-      - name: Upload GUI to Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: OpenCore-Patcher-GUI.app
-          path: OpenCore-Patcher-GUI.app.zip
-      - name: Upload CLI to Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: OCLP-CLI
-          path: OCLP-CLI
-      - name: Upload to Release
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: OpenCore-Patcher-GUI.app.zip
-          tag: ${{ github.ref }}
-          file_glob: true
-      - name: Validate OpenCore
-        run: ./OCLP-CLI --validate