Merge pull request #1155 from dortania/remove-shim

CI: Remove deprecated application

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

@@ -2,7 +2,7 @@ name: CI - Build wxPython
 
 on:
   push:
-    paths-ignore: 
+    paths-ignore:
       - 'docs/**'
   workflow_dispatch:
   release:
@@ -84,23 +84,6 @@ jobs:
           --run-as-individual-steps
           --prepare-package
 
-      - name: Prepare Update Shim (--prepare-shim)
-        run: >
-          /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 Build-Project.command
-          --application-signing-identity "${{ env.ORG_MAC_DEVELOPER_ID_APPLICATION_IDENTITY }}"
-          --notarization-apple-id "${{ env.ORG_MAC_NOTARIZATION_APPLE_ID }}" --notarization-password "${{ env.ORG_MAC_NOTARIZATION_PASSWORD }}" --notarization-team-id "${{ env.ORG_MAC_NOTARIZATION_TEAM_ID }}"
-          --run-as-individual-steps
-          --prepare-shim
-
-      - name: Prepare App for Upload
-        run: /bin/mv ./dist/OpenCore-Patcher.app.zip ./OpenCore-Patcher-GUI.app.zip
-
-      - name: Upload App to Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: OpenCore-Patcher.app (GUI)
-          path: OpenCore-Patcher-GUI.app.zip
-
       - name: Upload AutoPkg Package to Artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -119,15 +102,6 @@ jobs:
           name: OpenCore-Patcher-Uninstaller.pkg
           path: ./dist/OpenCore-Patcher-Uninstaller.pkg
 
-      - name: Upload Binary 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: Upload AutoPkg Package to Release
         if: github.event_name == 'release'
         uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d

Build-Project.command

@@ -7,7 +7,6 @@ import os
 import sys
 import time
 import argparse
-import plistlib
 
 from pathlib import Path
 
@@ -15,12 +14,9 @@ from ci_tooling.build_modules import (
     application,
     disk_images,
     package,
-    sign_notarize,
-    shim
+    sign_notarize
 )
 
-from opencore_legacy_patcher import constants
-
 
 def main() -> None:
     """
@@ -55,10 +51,6 @@ def main() -> None:
     parser.add_argument("--prepare-package", action="store_true", help="CI: Prepare Package", default=False)
     parser.add_argument("--prepare-assets", action="store_true", help="CI: Prepare Assets", default=False)
 
-    # CI/CD Parameters for additional steps
-    # If not specified, will not run additional steps
-    parser.add_argument("--prepare-shim", action="store_true", help="CI: Prepare Update Shim", default=False)
-
     # Analytics Parameters
     parser.add_argument("--analytics-key", type=str, help="Analytics Key", default=None)
     parser.add_argument("--analytics-endpoint", type=str, help="Analytics Endpoint", default=None)
@@ -136,31 +128,6 @@ def main() -> None:
             notarization_team_id=args.notarization_team_id,
         ).sign_and_notarize()
 
-    # Create Update Shim
-    if args.prepare_shim:
-        shim.GenerateShim().generate()
-        if Path("dist/OpenCore-Patcher.app").exists():
-            if Path("dist/OpenCore-Patcher (Original).app").exists():
-                Path("dist/OpenCore-Patcher (Original).app").unlink()
-            Path("dist/OpenCore-Patcher.app").rename("dist/OpenCore-Patcher (Original).app")
-        Path("dist/OpenCore-Patcher (Shim).app").rename("dist/OpenCore-Patcher.app")
-
-        # Update app version in Info.plist
-        plist_path = Path("dist/OpenCore-Patcher.app/Contents/Info.plist")
-        contents = plistlib.load(plist_path.open("rb"))
-        contents["CFBundleVersion"] = constants.Constants().patcher_version
-        contents["CFBundleShortVersionString"] = constants.Constants().patcher_version
-        plistlib.dump(contents, plist_path.open("wb"))
-
-        sign_notarize.SignAndNotarize(
-            path=Path("dist/OpenCore-Patcher.app"),
-            signing_identity=args.application_signing_identity,
-            notarization_apple_id=args.notarization_apple_id,
-            notarization_password=args.notarization_password,
-            notarization_team_id=args.notarization_team_id,
-            entitlements=Path("./ci_tooling/entitlements/entitlements.plist"),
-        ).sign_and_notarize()
-
 
 if __name__ == '__main__':
     _start = time.time()

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## 2.3.0
 - Disable crash analytics
   - Disabled server side for years, removing client side
+- `OpenCore-Patcher-GUI.app.zip` removed from release
+  - Deprecated in 1.5.0, use `OpenCore-Patcher.pkg` for installation
 
 ## 2.2.0
 - Resolved non-metal accessibility zoom on macOS Sonoma/Sequoia

ci_tooling/build_modules/shim.py

@@ -1,34 +0,0 @@
-"""
-shim.py: Generate Update Shim
-"""
-
-from pathlib import Path
-
-from opencore_legacy_patcher.volume  import generate_copy_arguments
-from opencore_legacy_patcher.support import subprocess_wrapper
-
-
-class GenerateShim:
-
-    def __init__(self) -> None:
-        self._shim_path = "./ci_tooling/update_shim/OpenCore-Patcher.app"
-        self._shim_pkg  = f"{self._shim_path}/Contents/Resources/OpenCore-Patcher.pkg"
-
-        self._build_pkg   = "./dist/OpenCore-Patcher.pkg"
-        self._output_shim = "./dist/OpenCore-Patcher (Shim).app"
-
-
-    def generate(self) -> None:
-        """
-        Generate Update Shim
-        """
-        print("Generating Update Shim")
-        if Path(self._shim_pkg).exists():
-            Path(self._shim_pkg).unlink()
-
-        subprocess_wrapper.run_and_verify(generate_copy_arguments(self._build_pkg, self._shim_pkg))
-
-        if Path(self._output_shim).exists():
-            Path(self._output_shim).unlink()
-
-        subprocess_wrapper.run_and_verify(generate_copy_arguments(self._shim_path, self._output_shim))

ci_tooling/update_shim/OpenCore-Patcher.app/Contents/Info.plist

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDisplayName</key>
-	<string>OpenCore-Patcher</string>
-	<key>CFBundleExecutable</key>
-	<string>OpenCore-Patcher</string>
-	<key>CFBundleIconFile</key>
-	<string>AppIcon.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.dortania.opencore-legacy-patcher</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>OpenCore Legacy Patcher</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.10.0</string>
-	<key>NSHighResolutionCapable</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020-2024 Dortania</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSRequiresAquaSystemAppearance</key>
-	<false/>
-</dict>
-</plist>

ci_tooling/update_shim/README.md

@@ -1,8 +0,0 @@
-# OpenCore-Patcher Update Shim
-
-To handle the new PKG installation method, old versions of OpenCore Legacy Patcher updating to newer versions will still require 'OpenCore-Patcher.app' to be available for download.
-
-Thus the goal of this app is to install an embedded PKG under ./OpenCore-Patcher.app/Contents/Resources/OpenCore-Patcher.pkg to handle the update process.
-
-Source is available at:
-* https://github.com/dortania/OCLP-Helper