Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopt https://github.com/tdlib/td/pull/2517 #188

Merged
merged 6 commits into from
Jul 31, 2023
Merged

Adopt https://github.com/tdlib/td/pull/2517 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f0c79e5
Adopt https://github.com/tdlib/td/pull/2517
Kylmakalle Jul 6, 2023
1e9dc79
Fix openssl build patch
Kylmakalle Jul 6, 2023
8fcb22d
Revert to TDLIB
Kylmakalle Jul 31, 2023
6c01ca2
Update td
Kylmakalle Jul 31, 2023
b8b4d71
Remove architectures patch
Kylmakalle Jul 31, 2023
21c004f
Update td
Kylmakalle Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ jobs:
- name: Patch Build
run: |
cp builder/tdlib-patches/build.sh td/example/ios
cd td
git apply ../builder/tdlib-patches/ios-cmake-arch.patch

- name: Cache tdlib
id: cache-tdlib
Expand Down Expand Up @@ -170,8 +168,6 @@ jobs:
- name: Patch Build
run: |
cp builder/tdlib-patches/build.sh td/example/ios
cd td
git apply ../builder/tdlib-patches/ios-cmake-arch.patch

- name: Cache tdlib
id: cache-tdlib
Expand Down Expand Up @@ -351,8 +347,6 @@ jobs:
- name: Patch Build
run: |
cp builder/tdlib-patches/build.sh td/example/ios
cd td
git apply ../builder/tdlib-patches/ios-cmake-arch.patch

- name: Cache tdlib
id: cache-tdlib
Expand Down Expand Up @@ -491,8 +485,6 @@ jobs:
- name: Patch Build
run: |
cp builder/tdlib-patches/build.sh td/example/ios
cd td
git apply ../builder/tdlib-patches/ios-cmake-arch.patch

- name: Cache tdlib
id: cache-tdlib
Expand Down Expand Up @@ -587,8 +579,6 @@ jobs:
- name: Patch Build
run: |
cp builder/tdlib-patches/build.sh td/example/ios
cd td
git apply ../builder/tdlib-patches/ios-cmake-arch.patch

- name: Cache tdlib
id: cache-tdlib
Expand Down Expand Up @@ -864,8 +854,6 @@ jobs:
- name: Patch Build
run: |
cp builder/tdlib-patches/build.sh td/example/ios
cd td
git apply ../builder/tdlib-patches/ios-cmake-arch.patch

- name: Cache tdlib
id: cache-tdlib
Expand Down
3 changes: 1 addition & 2 deletions builder/tdlib-patches/build-openssl.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ diff --git a/example/ios/build-openssl.sh b/example/ios/build-openssl.sh
index ce489e71..69d2462b 100755
--- a/example/ios/build-openssl.sh
+++ b/example/ios/build-openssl.sh
@@ -7,14 +7,14 @@ git apply ../Python-Apple-support.patch
@@ -7,13 +7,13 @@ git apply ../Python-Apple-support.patch
cd ..

#TODO: change openssl version
-platforms="macOS iOS watchOS tvOS"
+platforms="$1"

Expand Down
22 changes: 0 additions & 22 deletions builder/tdlib-patches/ios-cmake-arch.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion td
Open in desktop
Submodule td updated from 8893dc to 04e992