Skip to content

Commit 6de0a91

Browse files
author
Carlos Cabanero
committed
Blink release only
1 parent 38726da commit 6de0a91

File tree

4 files changed

+110
-123
lines changed

4 files changed

+110
-123
lines changed

‎.github/workflows/build.yml

Lines changed: 93 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -31,58 +31,6 @@ jobs:
3131
draft: false
3232
prerelease: false
3333

34-
- name: Upload ios_error.h
35-
id: upload_ios_error
36-
uses: actions/upload-release-asset@v1
37-
env:
38-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39-
with:
40-
upload_url: ${{ steps.create_release.outputs.upload_url }}
41-
asset_path: ios_error.h
42-
asset_name: ios_error.h
43-
asset_content_type: text/plain
44-
45-
- name: Upload commandDictionary.plist
46-
id: upload_commandDictionary
47-
uses: actions/upload-release-asset@v1
48-
env:
49-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50-
with:
51-
upload_url: ${{ steps.create_release.outputs.upload_url }}
52-
asset_path: ./Resources/commandDictionary.plist
53-
asset_name: commandDictionary.plist
54-
asset_content_type: text/plain
55-
56-
- name: Upload ios_system
57-
id: upload-ios_system
58-
uses: actions/upload-release-asset@v1
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
with:
62-
upload_url: ${{ steps.create_release.outputs.upload_url }}
63-
asset_path: .build/ios_system.xcframework.zip
64-
asset_name: ios_system.xcframework.zip
65-
asset_content_type: application/zip
66-
- name: Upload awk.xcframework
67-
id: upload-awk
68-
uses: actions/upload-release-asset@v1
69-
env:
70-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71-
with:
72-
upload_url: ${{ steps.create_release.outputs.upload_url }}
73-
asset_path: .build/awk.xcframework.zip
74-
asset_name: awk.xcframework.zip
75-
asset_content_type: application/zip
76-
- name: Upload tar.xcframework
77-
id: upload-tar
78-
uses: actions/upload-release-asset@v1
79-
env:
80-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81-
with:
82-
upload_url: ${{ steps.create_release.outputs.upload_url }}
83-
asset_path: .build/tar.xcframework.zip
84-
asset_name: tar.xcframework.zip
85-
asset_content_type: application/zip
8634
- name: Upload curl_ios.xcframework
8735
id: upload-curl_ios
8836
uses: actions/upload-release-asset@v1
@@ -93,43 +41,96 @@ jobs:
9341
asset_path: .build/curl_ios.xcframework.zip
9442
asset_name: curl_ios.xcframework.zip
9543
asset_content_type: application/zip
96-
- name: Upload files.xcframework
97-
id: upload-files
98-
uses: actions/upload-release-asset@v1
99-
env:
100-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
101-
with:
102-
upload_url: ${{ steps.create_release.outputs.upload_url }}
103-
asset_path: .build/files.xcframework.zip
104-
asset_name: files.xcframework.zip
105-
asset_content_type: application/zip
106-
- name: Upload shell.xcframework
107-
id: upload-shell
108-
uses: actions/upload-release-asset@v1
109-
env:
110-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111-
with:
112-
upload_url: ${{ steps.create_release.outputs.upload_url }}
113-
asset_path: .build/shell.xcframework.zip
114-
asset_name: shell.xcframework.zip
115-
asset_content_type: application/zip
116-
- name: Upload ssh_cmd.xcframework
117-
id: upload-ssh
118-
uses: actions/upload-release-asset@v1
119-
env:
120-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
121-
with:
122-
upload_url: ${{ steps.create_release.outputs.upload_url }}
123-
asset_path: .build/ssh_cmd.xcframework.zip
124-
asset_name: ssh_cmd.xcframework.zip
125-
asset_content_type: application/zip
126-
- name: Upload text.xcframework
127-
id: upload-text
128-
uses: actions/upload-release-asset@v1
129-
env:
130-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
131-
with:
132-
upload_url: ${{ steps.create_release.outputs.upload_url }}
133-
asset_path: .build/text.xcframework.zip
134-
asset_name: text.xcframework.zip
135-
asset_content_type: application/zip
44+
45+
# - name: Upload ios_error.h
46+
# id: upload_ios_error
47+
# uses: actions/upload-release-asset@v1
48+
# env:
49+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
# with:
51+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
52+
# asset_path: ios_error.h
53+
# asset_name: ios_error.h
54+
# asset_content_type: text/plain
55+
56+
# - name: Upload commandDictionary.plist
57+
# id: upload_commandDictionary
58+
# uses: actions/upload-release-asset@v1
59+
# env:
60+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
# with:
62+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
63+
# asset_path: ./Resources/commandDictionary.plist
64+
# asset_name: commandDictionary.plist
65+
# asset_content_type: text/plain
66+
67+
# - name: Upload ios_system
68+
# id: upload-ios_system
69+
# uses: actions/upload-release-asset@v1
70+
# env:
71+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72+
# with:
73+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
74+
# asset_path: .build/ios_system.xcframework.zip
75+
# asset_name: ios_system.xcframework.zip
76+
# asset_content_type: application/zip
77+
# - name: Upload awk.xcframework
78+
# id: upload-awk
79+
# uses: actions/upload-release-asset@v1
80+
# env:
81+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82+
# with:
83+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
84+
# asset_path: .build/awk.xcframework.zip
85+
# asset_name: awk.xcframework.zip
86+
# asset_content_type: application/zip
87+
# - name: Upload tar.xcframework
88+
# id: upload-tar
89+
# uses: actions/upload-release-asset@v1
90+
# env:
91+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
92+
# with:
93+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
94+
# asset_path: .build/tar.xcframework.zip
95+
# asset_name: tar.xcframework.zip
96+
# asset_content_type: application/zip
97+
# - name: Upload files.xcframework
98+
# id: upload-files
99+
# uses: actions/upload-release-asset@v1
100+
# env:
101+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
102+
# with:
103+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
104+
# asset_path: .build/files.xcframework.zip
105+
# asset_name: files.xcframework.zip
106+
# asset_content_type: application/zip
107+
# - name: Upload shell.xcframework
108+
# id: upload-shell
109+
# uses: actions/upload-release-asset@v1
110+
# env:
111+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
112+
# with:
113+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
114+
# asset_path: .build/shell.xcframework.zip
115+
# asset_name: shell.xcframework.zip
116+
# asset_content_type: application/zip
117+
# - name: Upload ssh_cmd.xcframework
118+
# id: upload-ssh
119+
# uses: actions/upload-release-asset@v1
120+
# env:
121+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122+
# with:
123+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
124+
# asset_path: .build/ssh_cmd.xcframework.zip
125+
# asset_name: ssh_cmd.xcframework.zip
126+
# asset_content_type: application/zip
127+
# - name: Upload text.xcframework
128+
# id: upload-text
129+
# uses: actions/upload-release-asset@v1
130+
# env:
131+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132+
# with:
133+
# upload_url: ${{ steps.create_release.outputs.upload_url }}
134+
# asset_path: .build/text.xcframework.zip
135+
# asset_name: text.xcframework.zip
136+
# asset_content_type: application/zip

‎curl_ios.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
2219E2CB1FD7E58600675252 /* tool_writeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2219E2681FD7E58600675252 /* tool_writeout.h */; };
355355
2219E2CC1FD7E58600675252 /* tool_xattr.c in Sources */ = {isa = PBXBuildFile; fileRef = 2219E2691FD7E58600675252 /* tool_xattr.c */; };
356356
2219E2CD1FD7E58600675252 /* tool_xattr.h in Headers */ = {isa = PBXBuildFile; fileRef = 2219E26A1FD7E58600675252 /* tool_xattr.h */; };
357-
BDF2B8E22BC490BE00B9C7EA /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDF2B8E12BC490BE00B9C7EA /* openssl.xcframework */; };
357+
BDF040DF2C9B1C64005B7138 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDF2B8E12BC490BE00B9C7EA /* openssl.xcframework */; };
358358
/* End PBXBuildFile section */
359359

360360
/* Begin PBXFileReference section */
@@ -715,7 +715,7 @@
715715
isa = PBXFrameworksBuildPhase;
716716
buildActionMask = 2147483647;
717717
files = (
718-
BDF2B8E22BC490BE00B9C7EA /* openssl.xcframework in Frameworks */,
718+
BDF040DF2C9B1C64005B7138 /* openssl.xcframework in Frameworks */,
719719
);
720720
runOnlyForDeploymentPostprocessing = 0;
721721
};

‎ios_system.xcodeproj/project.pbxproj

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -868,8 +868,7 @@
868868
BDD520932BB5FC57004E2457 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
869869
BDD520942BB5FC57004E2457 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
870870
BDD520952BB5FC57004E2457 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
871-
BDD520982BB5FC5C004E2457 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
872-
BDD520992BB5FC5C004E2457 /* openssl.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
871+
BDF040E22C9B2069005B7138 /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDD520922BB5FC57004E2457 /* openssl.xcframework */; };
873872
D285143225B1D7CD003405B4 /* sshkey.h in Headers */ = {isa = PBXBuildFile; fileRef = D285143125B1D7CD003405B4 /* sshkey.h */; };
874873
D285144425B1DE19003405B4 /* cipher.h in Headers */ = {isa = PBXBuildFile; fileRef = D285144325B1DE19003405B4 /* cipher.h */; };
875874
D285145625B1DE61003405B4 /* ssherr.h in Headers */ = {isa = PBXBuildFile; fileRef = D285145525B1DE61003405B4 /* ssherr.h */; };
@@ -879,20 +878,6 @@
879878
D28514A625B20351003405B4 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = D28514A525B20351003405B4 /* config.h */; };
880879
/* End PBXBuildFile section */
881880

882-
/* Begin PBXCopyFilesBuildPhase section */
883-
BDD5209A2BB5FC5C004E2457 /* Embed Frameworks */ = {
884-
isa = PBXCopyFilesBuildPhase;
885-
buildActionMask = 2147483647;
886-
dstPath = "";
887-
dstSubfolderSpec = 10;
888-
files = (
889-
BDD520992BB5FC5C004E2457 /* openssl.xcframework in Embed Frameworks */,
890-
);
891-
name = "Embed Frameworks";
892-
runOnlyForDeploymentPostprocessing = 0;
893-
};
894-
/* End PBXCopyFilesBuildPhase section */
895-
896881
/* Begin PBXFileReference section */
897882
22122E2A21BC129000D8FE74 /* say.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = say.m; sourceTree = "<group>"; };
898883
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 @@
16371622
isa = PBXFrameworksBuildPhase;
16381623
buildActionMask = 2147483647;
16391624
files = (
1625+
BDF040E22C9B2069005B7138 /* openssl.xcframework in Frameworks */,
16401626
22F6A25E20683F9B00E618F9 /* ios_system.framework in Frameworks */,
1641-
BDD520982BB5FC5C004E2457 /* openssl.xcframework in Frameworks */,
16421627
);
16431628
runOnlyForDeploymentPostprocessing = 0;
16441629
};
@@ -3208,7 +3193,6 @@
32083193
22F6A1AB20683F4100E618F9 /* Frameworks */,
32093194
22F6A1AC20683F4100E618F9 /* Headers */,
32103195
22F6A1AD20683F4100E618F9 /* Resources */,
3211-
BDD5209A2BB5FC5C004E2457 /* Embed Frameworks */,
32123196
);
32133197
buildRules = (
32143198
);

‎xcfs/Sources/build/main.swift

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ OutputLevel.default = .error
1010
let platforms: [Platform] = [.iPhoneOS, .iPhoneSimulator, .Catalyst]
1111

1212
let allSchemes = [
13-
"ios_system",
14-
"awk",
15-
"curl_ios",
16-
"files",
17-
"shell",
18-
"ssh_cmd",
19-
"ssh_cmdA",
20-
"ssh_agent",
21-
"sshd",
22-
"tar",
23-
"text",
13+
//"ios_system",
14+
//"awk",
15+
"curl_ios",
16+
//"files",
17+
//"shell",
18+
// "ssh_cmd",
19+
// "ssh_cmdA",
20+
// "ssh_agent",
21+
// "sshd",
22+
//"tar",
23+
//"text",
2424
]
2525

2626
let args = ProcessInfo.processInfo.arguments
@@ -54,6 +54,8 @@ var releaseNotes =
5454
"""
5555
Release notes:
5656
57+
This Blink version only releases the modified libraries against regular ios_system.
58+
5759
\( checksums.markdown(headers: "File", "SHA 256") )
5860
5961
"""

0 commit comments

Comments
 (0)