Skip to content

Commit 810939c

Browse files
XITRIXXITRIX
committed
Git migration to iTorrent 2.0
1 parent 5e86bd5 commit 810939c

File tree

3 files changed

+17
-39
lines changed

3 files changed

+17
-39
lines changed

‎.github/workflows/ios.yml‎

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,19 @@ jobs:
3232
env:
3333
FIREBASE_INFO_PLIST_BASE64: ${{ secrets.FIREBASE_INFO_PLIST_BASE64 }}
3434
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
35-
BUILD_DISTRIB_CERTIFICATE_BASE64: ${{ secrets.BUILD_DISTRIB_CERTIFICATE_BASE64 }}
36-
P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
35+
BUILD_CERTIFICATE_PASSWORD: ${{ secrets.BUILD_CERTIFICATE_PASSWORD }}
3736
BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
38-
BUILD_PROVISION_PROFILE_DISTRIB_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_DISTRIB_BASE64 }}
3937
BUILD_PROVISION_PROFILE_PROD_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_PROD_BASE64 }}
4038
BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_BASE64 }}
41-
BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_DISTRIB_BASE64: ${{ secrets.BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_DISTRIB_BASE64 }}
4239
BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_PROD_BASE64: ${{ secrets.BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_PROD_BASE64 }}
4340
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
4441
run: |
4542
# create variables
4643
FIREBASE_INFO_PLIST_PATH=iTorrent/Core/Assets/GoogleService-Info.plist
4744
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
48-
CERTIFICATE_DISTRIB_PATH=$RUNNER_TEMP/build_distrib_certificate.p12
4945
PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
50-
PP_DISTRIB_PATH=$RUNNER_TEMP/build_pp_distrib.mobileprovision
5146
PP_PROD_PATH=$RUNNER_TEMP/build_pp_prod.mobileprovision
5247
PW_PP_PATH=$RUNNER_TEMP/build_progresswidget_pp.mobileprovision
53-
PW_PP_DISTRIB_PATH=$RUNNER_TEMP/build_progresswidget_pp_distrib.mobileprovision
5448
PW_PP_PROD_PATH=$RUNNER_TEMP/build_progresswidget_pp_prod.mobileprovision
5549
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
5650
@@ -59,12 +53,9 @@ jobs:
5953
6054
# import certificate and provisioning profile from secrets
6155
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
62-
echo -n "$BUILD_DISTRIB_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_DISTRIB_PATH
6356
echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
64-
echo -n "$BUILD_PROVISION_PROFILE_DISTRIB_BASE64" | base64 --decode -o $PP_DISTRIB_PATH
6557
echo -n "$BUILD_PROVISION_PROFILE_PROD_BASE64" | base64 --decode -o $PP_PROD_PATH
6658
echo -n "$BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_BASE64" | base64 --decode -o $PW_PP_PATH
67-
echo -n "$BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_DISTRIB_BASE64" | base64 --decode -o $PW_PP_DISTRIB_PATH
6859
echo -n "$BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_PROD_BASE64" | base64 --decode -o $PW_PP_PROD_PATH
6960
7061
# create temporary keychain
@@ -73,18 +64,15 @@ jobs:
7364
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
7465
7566
# import certificate to keychain
76-
security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
77-
security import $CERTIFICATE_DISTRIB_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
67+
security import $CERTIFICATE_PATH -P "$BUILD_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
7868
security list-keychain -d user -s $KEYCHAIN_PATH
7969
8070
# apply provisioning profile
8171
mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
82-
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
83-
cp $PP_DISTRIB_PATH ~/Library/MobileDevice/Provisioning\ Profiles
84-
cp $PP_PROD_PATH ~/Library/MobileDevice/Provisioning\ Profiles
72+
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
73+
cp $PP_PROD_PATH ~/Library/MobileDevice/Provisioning\ Profiles
8574
cp $PW_PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
86-
cp $PW_PP_DISTRIB_PATH ~/Library/MobileDevice/Provisioning\ Profiles
87-
cp $PW_PP_PROD_PATH ~/Library/MobileDevice/Provisioning\ Profiles
75+
cp $PW_PP_PROD_PATH ~/Library/MobileDevice/Provisioning\ Profiles
8876
8977
- name: Fix build number
9078
run: |
@@ -134,35 +122,26 @@ jobs:
134122
- name: Install the Apple certificate and provisioning profile
135123
env:
136124
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
137-
BUILD_DISTRIB_CERTIFICATE_BASE64: ${{ secrets.BUILD_DISTRIB_CERTIFICATE_BASE64 }}
138-
P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
125+
BUILD_CERTIFICATE_PASSWORD: ${{ secrets.BUILD_CERTIFICATE_PASSWORD }}
139126
BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
140-
BUILD_PROVISION_PROFILE_DISTRIB_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_DISTRIB_BASE64 }}
141127
BUILD_PROVISION_PROFILE_PROD_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_PROD_BASE64 }}
142128
BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_BASE64 }}
143-
BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_DISTRIB_BASE64: ${{ secrets.BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_DISTRIB_BASE64 }}
144129
BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_PROD_BASE64: ${{ secrets.BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_PROD_BASE64 }}
145130
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
146131
run: |
147132
# create variables
148133
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
149-
CERTIFICATE_DISTRIB_PATH=$RUNNER_TEMP/build_distrib_certificate.p12
150134
PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
151-
PP_DISTRIB_PATH=$RUNNER_TEMP/build_pp_distrib.mobileprovision
152135
PP_PROD_PATH=$RUNNER_TEMP/build_pp_prod.mobileprovision
153136
PW_PP_PATH=$RUNNER_TEMP/build_progresswidget_pp.mobileprovision
154-
PW_PP_DISTRIB_PATH=$RUNNER_TEMP/build_progresswidget_pp_distrib.mobileprovision
155137
PW_PP_PROD_PATH=$RUNNER_TEMP/build_progresswidget_pp_prod.mobileprovision
156138
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
157139
158140
# import certificate and provisioning profile from secrets
159141
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
160-
echo -n "$BUILD_DISTRIB_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_DISTRIB_PATH
161142
echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
162-
echo -n "$BUILD_PROVISION_PROFILE_DISTRIB_BASE64" | base64 --decode -o $PP_DISTRIB_PATH
163143
echo -n "$BUILD_PROVISION_PROFILE_PROD_BASE64" | base64 --decode -o $PP_PROD_PATH
164144
echo -n "$BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_BASE64" | base64 --decode -o $PW_PP_PATH
165-
echo -n "$BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_DISTRIB_BASE64" | base64 --decode -o $PW_PP_DISTRIB_PATH
166145
echo -n "$BUILD_PROGRESS_WIDGET_PROVISION_PROFILE_PROD_BASE64" | base64 --decode -o $PW_PP_PROD_PATH
167146
168147
# create temporary keychain
@@ -171,18 +150,15 @@ jobs:
171150
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
172151
173152
# import certificate to keychain
174-
security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
175-
security import $CERTIFICATE_DISTRIB_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
153+
security import $CERTIFICATE_PATH -P "$BUILD_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
176154
security list-keychain -d user -s $KEYCHAIN_PATH
177155
178156
# apply provisioning profile
179157
mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
180-
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
181-
cp $PP_DISTRIB_PATH ~/Library/MobileDevice/Provisioning\ Profiles
182-
cp $PP_PROD_PATH ~/Library/MobileDevice/Provisioning\ Profiles
158+
cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
159+
cp $PP_PROD_PATH ~/Library/MobileDevice/Provisioning\ Profiles
183160
cp $PW_PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
184-
cp $PW_PP_DISTRIB_PATH ~/Library/MobileDevice/Provisioning\ Profiles
185-
cp $PW_PP_PROD_PATH ~/Library/MobileDevice/Provisioning\ Profiles
161+
cp $PW_PP_PROD_PATH ~/Library/MobileDevice/Provisioning\ Profiles
186162
187163
- name: Export ipa
188164
env:
@@ -224,7 +200,7 @@ jobs:
224200
uses: softprops/action-gh-release@v2
225201
if: startsWith(github.ref, 'refs/tags/')
226202
with:
227-
repository: XITRIX/iTorrent-v2
203+
repository: XITRIX/iTorrent
228204
token: ${{ secrets.DISTRIB_REPO_ACCESS_TOKEN }}
229205
files: |
230206
app-Release-adhoc/build/iTorrent.ipa
@@ -278,4 +254,4 @@ jobs:
278254
- name: Upload app to TestFlight
279255
run: |
280256
# xcrun altool --upload-package app-Release-prod/build/iTorrent.ipa --apiKey ${{ secrets.APPSTORE_CONNECT_KEY_ID }} --apiIssuer ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
281-
xcrun altool --upload-app -f app-Release-prod/build/iTorrent.ipa --apiKey ${{ secrets.APPSTORE_CONNECT_KEY_ID }} --apiIssuer ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }} -t ios
257+
xcrun altool --upload-app -f app-Release-prod/build/iTorrent.ipa --apiKey ${{ secrets.APPSTORE_CONNECT_KEY_ID }} --apiIssuer ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }} -t ios

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Git migration to iTorrent 2.0 in progress
2+
13
[![AltStore Button]][AltStore Link]
24
[![SideStore Button]][SideStore Link]
35
[![Jailbreak Button]][Jailbreak Link]

‎iTorrent.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,7 +1787,7 @@
17871787
CLANG_WARN_UNREACHABLE_CODE = YES;
17881788
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
17891789
COPY_PHASE_STRIP = NO;
1790-
CURRENT_PROJECT_VERSION = 2;
1790+
CURRENT_PROJECT_VERSION = 1;
17911791
DEBUG_INFORMATION_FORMAT = dwarf;
17921792
ENABLE_STRICT_OBJC_MSGSEND = YES;
17931793
ENABLE_TESTABILITY = YES;
@@ -1932,7 +1932,7 @@
19321932
CLANG_WARN_UNREACHABLE_CODE = YES;
19331933
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
19341934
COPY_PHASE_STRIP = NO;
1935-
CURRENT_PROJECT_VERSION = 2;
1935+
CURRENT_PROJECT_VERSION = 1;
19361936
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
19371937
ENABLE_NS_ASSERTIONS = NO;
19381938
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2072,7 +2072,7 @@
20722072
CLANG_WARN_UNREACHABLE_CODE = YES;
20732073
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
20742074
COPY_PHASE_STRIP = NO;
2075-
CURRENT_PROJECT_VERSION = 2;
2075+
CURRENT_PROJECT_VERSION = 1;
20762076
DEBUG_INFORMATION_FORMAT = dwarf;
20772077
ENABLE_STRICT_OBJC_MSGSEND = YES;
20782078
ENABLE_TESTABILITY = YES;

0 commit comments

Comments
 (0)