From 10fef8271410fde4ffaff0c583d1b6be49cdb03e Mon Sep 17 00:00:00 2001 From: JJTech Date: Tue, 21 Jun 2022 15:39:46 -0400 Subject: [PATCH 1/4] Add InteliJ to git ignore (#44) Ignore AppCode/InteliJ .idea folder --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 999c40b3..828867e3 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ xcuserdata /newrelic_agent.log /CodeSigning.xcconfig /.vscode + +## AppCode specific +.idea/ From 800ae65ee4f9705d8ea9687fc233b214454ec87a Mon Sep 17 00:00:00 2001 From: JJTech Date: Wed, 22 Jun 2022 10:29:05 -0400 Subject: [PATCH 2/4] Fix CI (#47) * Try downgrading to macOS 11 Signed-off-by: JJTech * Delete Package.resolved Signed-off-by: JJTech * Add Packagage.resolved to .gitignore Signed-off-by: JJTech --- .github/workflows/build.yml | 2 +- .gitignore | 2 + .../xcshareddata/swiftpm/Package.resolved | 86 ------------------- 3 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c4481e9..29b7fcd9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: [push, pull_request] jobs: build: name: Build and upload SideStore - runs-on: macos-12 + runs-on: macos-11 steps: - name: Checkout code uses: actions/checkout@v2 diff --git a/.gitignore b/.gitignore index 828867e3..063299e2 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ xcuserdata ## AppCode specific .idea/ + +Package.resolved diff --git a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index ce2c36c6..00000000 --- a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,86 +0,0 @@ -{ - "pins" : [ - { - "identity" : "altsign", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SideStore/AltSign", - "state" : { - "branch" : "master", - "revision" : "7e0e7edcf8fbc44ac1e35da3e9030a297aa18b84" - } - }, - { - "identity" : "appcenter-sdk-apple", - "kind" : "remoteSourceControl", - "location" : "https://github.com/microsoft/appcenter-sdk-apple.git", - "state" : { - "revision" : "8354a50fe01a7e54e196d3b5493b5ab53dd5866a", - "version" : "4.4.2" - } - }, - { - "identity" : "keychainaccess", - "kind" : "remoteSourceControl", - "location" : "https://github.com/kishikawakatsumi/KeychainAccess.git", - "state" : { - "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7", - "version" : "4.2.2" - } - }, - { - "identity" : "launchatlogin", - "kind" : "remoteSourceControl", - "location" : "https://github.com/sindresorhus/LaunchAtLogin.git", - "state" : { - "revision" : "e8171b3e38a2816f579f58f3dac1522aa39efe41", - "version" : "4.2.0" - } - }, - { - "identity" : "nuke", - "kind" : "remoteSourceControl", - "location" : "https://github.com/kean/Nuke.git", - "state" : { - "revision" : "9318d02a8a6d20af56505c9673261c1fd3b3aebe", - "version" : "7.6.3" - } - }, - { - "identity" : "openssl", - "kind" : "remoteSourceControl", - "location" : "https://github.com/krzyzanowskim/OpenSSL", - "state" : { - "revision" : "033fcb41dac96b1b6effa945ca1f9ade002370b2", - "version" : "1.1.1501" - } - }, - { - "identity" : "plcrashreporter", - "kind" : "remoteSourceControl", - "location" : "https://github.com/microsoft/PLCrashReporter.git", - "state" : { - "revision" : "6b27393cad517c067dceea85fadf050e70c4ceaa", - "version" : "1.10.1" - } - }, - { - "identity" : "sparkle", - "kind" : "remoteSourceControl", - "location" : "https://github.com/sparkle-project/Sparkle.git", - "state" : { - "revision" : "286edd1fa22505a9e54d170e9fd07d775ea233f2", - "version" : "2.1.0" - } - }, - { - "identity" : "stprivilegedtask", - "kind" : "remoteSourceControl", - "location" : "https://github.com/JoeMatt/STPrivilegedTask.git", - "state" : { - "branch" : "master", - "revision" : "10a9150ef32d444af326beba76356ae9af95a3e7" - } - } - ], - "version" : 2 -} From 08c9c746bf317663eff11226e395cf8b55a93a37 Mon Sep 17 00:00:00 2001 From: JJTech Date: Thu, 23 Jun 2022 11:47:01 -0400 Subject: [PATCH 3/4] Put back Package.resolved, have CI remove it (#49) * Remove swift resolved packages from git ignore * Add Package.resolved to * Have CI remove Package.resolved --- .github/workflows/build.yml | 1 + .gitignore | 4 +- .../xcshareddata/swiftpm/Package.resolved | 86 +++++++++++++++++++ 3 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29b7fcd9..01a45e86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,7 @@ jobs: - name: Build SideStore run: | rm -rf ~/Library/Developer/Xcode/DerivedData/ + rm ./AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved xcodebuild -project AltStore.xcodeproj -scheme AltStore -sdk iphoneos archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO | xcpretty && exit ${PIPESTATUS[0]} - name: Convert to IPA run: | diff --git a/.gitignore b/.gitignore index 063299e2..d9f6be2f 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,4 @@ xcuserdata /.vscode ## AppCode specific -.idea/ - -Package.resolved +.idea/ \ No newline at end of file diff --git a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..ce2c36c6 --- /dev/null +++ b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,86 @@ +{ + "pins" : [ + { + "identity" : "altsign", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SideStore/AltSign", + "state" : { + "branch" : "master", + "revision" : "7e0e7edcf8fbc44ac1e35da3e9030a297aa18b84" + } + }, + { + "identity" : "appcenter-sdk-apple", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/appcenter-sdk-apple.git", + "state" : { + "revision" : "8354a50fe01a7e54e196d3b5493b5ab53dd5866a", + "version" : "4.4.2" + } + }, + { + "identity" : "keychainaccess", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kishikawakatsumi/KeychainAccess.git", + "state" : { + "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7", + "version" : "4.2.2" + } + }, + { + "identity" : "launchatlogin", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sindresorhus/LaunchAtLogin.git", + "state" : { + "revision" : "e8171b3e38a2816f579f58f3dac1522aa39efe41", + "version" : "4.2.0" + } + }, + { + "identity" : "nuke", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kean/Nuke.git", + "state" : { + "revision" : "9318d02a8a6d20af56505c9673261c1fd3b3aebe", + "version" : "7.6.3" + } + }, + { + "identity" : "openssl", + "kind" : "remoteSourceControl", + "location" : "https://github.com/krzyzanowskim/OpenSSL", + "state" : { + "revision" : "033fcb41dac96b1b6effa945ca1f9ade002370b2", + "version" : "1.1.1501" + } + }, + { + "identity" : "plcrashreporter", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/PLCrashReporter.git", + "state" : { + "revision" : "6b27393cad517c067dceea85fadf050e70c4ceaa", + "version" : "1.10.1" + } + }, + { + "identity" : "sparkle", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sparkle-project/Sparkle.git", + "state" : { + "revision" : "286edd1fa22505a9e54d170e9fd07d775ea233f2", + "version" : "2.1.0" + } + }, + { + "identity" : "stprivilegedtask", + "kind" : "remoteSourceControl", + "location" : "https://github.com/JoeMatt/STPrivilegedTask.git", + "state" : { + "branch" : "master", + "revision" : "10a9150ef32d444af326beba76356ae9af95a3e7" + } + } + ], + "version" : 2 +} From 55f172fcc86d187c97eb78b36f4fefddcbcc369f Mon Sep 17 00:00:00 2001 From: JJTech Date: Thu, 23 Jun 2022 11:47:17 -0400 Subject: [PATCH 4/4] Add build badge, fix PR badge style (#50) * Add build badge, fix PR badge style Signed-off-by: JJTech * Badge links HTTPS Signed-off-by: JJTech --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e8817dd..7d5f982d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ [![Swift Version](https://img.shields.io/badge/swift-5.0-orange.svg)](https://swift.org/) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0) -[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) +[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://makeapullrequest.com) +[![Build and Upload SideStore](https://github.com/SideStore/SideStore/actions/workflows/build.yml/badge.svg)](https://github.com/SideStore/SideStore/actions/workflows/build.yml) SideStore is an iOS application that allows you to sideload other apps (.ipa files) onto your iOS device with just your Apple ID. SideStore resigns apps with your personal development certificate and sends them to a desktop app called AltServer or use the SideStore VPN, which installs the resigned apps back to your device using iTunes WiFi sync or using the SideStore VPN where you can sideload at any place over wifi that supports zerotier that has internet. To prevent apps from expiring, SideStore just like AltStore will also periodically refresh your apps in the background when on the same WiFi as AltServer or using SideStore VPN over wifi on any network that includes a internet connection.