Blink release only

blinksh · Sep 18, 2024 · 6de0a91 · 6de0a91
1 parent 38726da
commit 6de0a91
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 123 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,58 +31,6 @@ jobs:
         draft: false
         prerelease: false
 
-    - name: Upload ios_error.h
-      id: upload_ios_error
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: ios_error.h
-        asset_name: ios_error.h
-        asset_content_type: text/plain
-
-    - name: Upload commandDictionary.plist 
-      id: upload_commandDictionary
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: ./Resources/commandDictionary.plist
-        asset_name: commandDictionary.plist
-        asset_content_type: text/plain
-
-    - name: Upload ios_system
-      id: upload-ios_system
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: .build/ios_system.xcframework.zip
-        asset_name: ios_system.xcframework.zip
-        asset_content_type: application/zip
-    - name: Upload awk.xcframework
-      id: upload-awk
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: .build/awk.xcframework.zip
-        asset_name: awk.xcframework.zip
-        asset_content_type: application/zip
-    - name: Upload tar.xcframework
-      id: upload-tar
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: .build/tar.xcframework.zip
-        asset_name: tar.xcframework.zip
-        asset_content_type: application/zip
     - name: Upload curl_ios.xcframework
       id: upload-curl_ios
       uses: actions/upload-release-asset@v1
@@ -93,43 +41,96 @@ jobs:
         asset_path: .build/curl_ios.xcframework.zip
         asset_name: curl_ios.xcframework.zip
         asset_content_type: application/zip
-    - name: Upload files.xcframework
-      id: upload-files
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: .build/files.xcframework.zip
-        asset_name: files.xcframework.zip
-        asset_content_type: application/zip
-    - name: Upload shell.xcframework
-      id: upload-shell
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: .build/shell.xcframework.zip
-        asset_name: shell.xcframework.zip
-        asset_content_type: application/zip
-    - name: Upload ssh_cmd.xcframework
-      id: upload-ssh
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: .build/ssh_cmd.xcframework.zip
-        asset_name: ssh_cmd.xcframework.zip
-        asset_content_type: application/zip
-    - name: Upload text.xcframework
-      id: upload-text
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} 
-        asset_path: .build/text.xcframework.zip
-        asset_name: text.xcframework.zip
-        asset_content_type: application/zip
+
+    # - name: Upload ios_error.h
+    #   id: upload_ios_error
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: ios_error.h
+    #     asset_name: ios_error.h
+    #     asset_content_type: text/plain
+
+    # - name: Upload commandDictionary.plist 
+    #   id: upload_commandDictionary
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: ./Resources/commandDictionary.plist
+    #     asset_name: commandDictionary.plist
+    #     asset_content_type: text/plain
+
+    # - name: Upload ios_system
+    #   id: upload-ios_system
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: .build/ios_system.xcframework.zip
+    #     asset_name: ios_system.xcframework.zip
+    #     asset_content_type: application/zip
+    # - name: Upload awk.xcframework
+    #   id: upload-awk
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: .build/awk.xcframework.zip
+    #     asset_name: awk.xcframework.zip
+    #     asset_content_type: application/zip
+    # - name: Upload tar.xcframework
+    #   id: upload-tar
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: .build/tar.xcframework.zip
+    #     asset_name: tar.xcframework.zip
+    #     asset_content_type: application/zip
+    # - name: Upload files.xcframework
+    #   id: upload-files
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: .build/files.xcframework.zip
+    #     asset_name: files.xcframework.zip
+    #     asset_content_type: application/zip
+    # - name: Upload shell.xcframework
+    #   id: upload-shell
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: .build/shell.xcframework.zip
+    #     asset_name: shell.xcframework.zip
+    #     asset_content_type: application/zip
+    # - name: Upload ssh_cmd.xcframework
+    #   id: upload-ssh
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: .build/ssh_cmd.xcframework.zip
+    #     asset_name: ssh_cmd.xcframework.zip
+    #     asset_content_type: application/zip
+    # - name: Upload text.xcframework
+    #   id: upload-text
+    #   uses: actions/upload-release-asset@v1
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   with:
+    #     upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    #     asset_path: .build/text.xcframework.zip
+    #     asset_name: text.xcframework.zip
+    #     asset_content_type: application/zip
diff --git a/curl_ios.xcodeproj/project.pbxproj b/curl_ios.xcodeproj/project.pbxproj
@@ -354,7 +354,7 @@
 		2219E2CB1FD7E58600675252 /* tool_writeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2219E2681FD7E58600675252 /* tool_writeout.h */; };
 		2219E2CC1FD7E58600675252 /* tool_xattr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2219E2691FD7E58600675252 /* tool_xattr.c */; };
 		2219E2CD1FD7E58600675252 /* tool_xattr.h in Headers */ = {isa = PBXBuildFile; fileRef = 2219E26A1FD7E58600675252 /* tool_xattr.h */; };
-		BDF2B8E22BC490BE00B9C7EA /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDF2B8E12BC490BE00B9C7EA /* openssl.xcframework */; };
+		BDF040DF2C9B1C64005B7138 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDF2B8E12BC490BE00B9C7EA /* openssl.xcframework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -715,7 +715,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BDF2B8E22BC490BE00B9C7EA /* openssl.xcframework in Frameworks */,
+				BDF040DF2C9B1C64005B7138 /* openssl.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/ios_system.xcodeproj/project.pbxproj b/ios_system.xcodeproj/project.pbxproj
@@ -868,8 +868,7 @@
 		BDD520932BB5FC57004E2457 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
 		BDD520942BB5FC57004E2457 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
 		BDD520952BB5FC57004E2457 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
-		BDD520982BB5FC5C004E2457 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
-		BDD520992BB5FC5C004E2457 /* openssl.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		BDF040E22C9B2069005B7138 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
 		D285143225B1D7CD003405B4 /* sshkey.h in Headers */ = {isa = PBXBuildFile; fileRef = D285143125B1D7CD003405B4 /* sshkey.h */; };
 		D285144425B1DE19003405B4 /* cipher.h in Headers */ = {isa = PBXBuildFile; fileRef = D285144325B1DE19003405B4 /* cipher.h */; };
 		D285145625B1DE61003405B4 /* ssherr.h in Headers */ = {isa = PBXBuildFile; fileRef = D285145525B1DE61003405B4 /* ssherr.h */; };
@@ -879,20 +878,6 @@
 		D28514A625B20351003405B4 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = D28514A525B20351003405B4 /* config.h */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		BDD5209A2BB5FC5C004E2457 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				BDD520992BB5FC5C004E2457 /* openssl.xcframework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		22122E2A21BC129000D8FE74 /* say.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = say.m; sourceTree = "<group>"; };
 		2216426C2B7B9B5F00043766 /* ssh-add.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ssh-add.c"; path = "ssh_keygen/ssh-add.c"; sourceTree = SOURCE_ROOT; };
@@ -1637,8 +1622,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BDF040E22C9B2069005B7138 /* openssl.xcframework in Frameworks */,
 				22F6A25E20683F9B00E618F9 /* ios_system.framework in Frameworks */,
-				BDD520982BB5FC5C004E2457 /* openssl.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3208,7 +3193,6 @@
 				22F6A1AB20683F4100E618F9 /* Frameworks */,
 				22F6A1AC20683F4100E618F9 /* Headers */,
 				22F6A1AD20683F4100E618F9 /* Resources */,
-				BDD5209A2BB5FC5C004E2457 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);

diff --git a/xcfs/Sources/build/main.swift b/xcfs/Sources/build/main.swift
@@ -10,17 +10,17 @@ OutputLevel.default = .error
 let platforms: [Platform] = [.iPhoneOS, .iPhoneSimulator, .Catalyst]
 
 let allSchemes = [
-    "ios_system",
-    "awk",
-    "curl_ios", 
-    "files",
-    "shell",
-    "ssh_cmd",
-    "ssh_cmdA",
-    "ssh_agent",
-    "sshd",
-    "tar",
-    "text",
+    //"ios_system",
+    //"awk",
+    "curl_ios",
+    //"files",
+    //"shell",
+    // "ssh_cmd",
+    // "ssh_cmdA",
+    // "ssh_agent",
+    // "sshd",
+    //"tar",
+    //"text",
     ]
 
 let args = ProcessInfo.processInfo.arguments 
@@ -54,6 +54,8 @@ var releaseNotes =
 """
 Release notes:
 
+This Blink version only releases the modified libraries against regular ios_system.
+
 \( checksums.markdown(headers: "File", "SHA 256") )
 
 """