From 8bcc3370bd1293b5365d528aa843a9ce517c5981 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Fri, 30 Dec 2022 17:47:49 -0500 Subject: [PATCH 1/9] Update build_app.yml Signed-off-by: Joseph Mattello --- .github/workflows/build_app.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index 0aaa1de..7bd5672 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -1,10 +1,16 @@ -name: build_app +name: Build .app -on: [push, workflow_dispatch] +on: + push: + branches: + - master + - develop + pull_request: + workflow_dispatch: env: SCHEME: AltServer - + jobs: master_deploy: runs-on: macos-latest @@ -13,11 +19,11 @@ jobs: - name: Checkout project uses: actions/checkout@v2 with: - submodules: recursive - + submodules: recursive + - name: Set environment variables from project settings run: | - function set-env-from-proj { + function set-env-from-proj { echo "$1=$(xcodebuild -scheme "AltServer" -showBuildSettings | grep " $1 " | sed "s/[ ]*$1 = //")" >> $GITHUB_ENV } set-env-from-proj FULL_PRODUCT_NAME From c3f55804901c83b0bec86c944be8b87607520269 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Fri, 30 Dec 2022 17:51:59 -0500 Subject: [PATCH 2/9] build.yml remove xcpretty Signed-off-by: Joseph Mattello --- .github/workflows/build_app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index 7bd5672..15b227a 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -36,7 +36,7 @@ jobs: - name: Build and install app shell: bash run: | - xcodebuild -scheme "$SCHEME" install DSTROOT=build/root | xcpretty + xcodebuild -scheme "$SCHEME" install DSTROOT=build/root - name: Package app run: | From 8ed178df6c687c2091db17ea1b27f7b06d98f63b Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Fri, 30 Dec 2022 18:06:07 -0500 Subject: [PATCH 3/9] build archive Signed-off-by: Joseph Mattello --- .github/workflows/build_app.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index 15b227a..b03d262 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -34,9 +34,18 @@ jobs: set-env-from-proj PROJECT_NAME - name: Build and install app - shell: bash run: | - xcodebuild -scheme "$SCHEME" install DSTROOT=build/root + xcodebuild -project AltStore.xcodeproj \ + -scheme AltServer \ + -sdk macosx \ + install \ + CODE_SIGNING_REQUIRED=NO \ + AD_HOC_CODE_SIGNING_ALLOWED=YES \ + CODE_SIGNING_ALLOWED=NO \ + DEVELOPMENT_TEAM=XYZ0123456 \ + ORG_IDENTIFIER=com.SideStore \ + DSTROOT=build/root \ + | xcpretty && exit ${PIPESTATUS[0]} - name: Package app run: | From 51292991719a5e08bb769a6d9cb16b28b2dc7aa0 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Fri, 30 Dec 2022 18:16:07 -0500 Subject: [PATCH 4/9] use xcode 14.2 Signed-off-by: Joseph Mattello --- .github/workflows/build_app.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index b03d262..f198750 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -10,10 +10,11 @@ on: env: SCHEME: AltServer + XCTOOL_XCODE_VERSION: 14.2 jobs: master_deploy: - runs-on: macos-latest + runs-on: macos-12 steps: - name: Checkout project @@ -21,6 +22,11 @@ jobs: with: submodules: recursive + - name: Setup Xcode + uses: maxim-lobanov/setup-xcode@v1.4.1 + with: + xcode-version: ${ XCTOOL_XCODE_VERSION } + - name: Set environment variables from project settings run: | function set-env-from-proj { From 0e7bdad2773b0694aa5049ee36d6d2b455cb7eb2 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Fri, 30 Dec 2022 18:19:16 -0500 Subject: [PATCH 5/9] small xcodeprojpath changes Signed-off-by: Joseph Mattello --- AltStore.xcodeproj/project.pbxproj | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index d4e4012..d4acb42 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -880,6 +880,7 @@ buildRules = ( ); dependencies = ( + B3991616295FA96300136B2C /* PBXTargetDependency */, BFF7C90E257844C900E55F36 /* PBXTargetDependency */, 0380808C28C6E10300C653E1 /* PBXTargetDependency */, ); @@ -1208,6 +1209,10 @@ target = BF45872A2298D31600BD7491 /* libimobiledevice */; targetProxy = 0380808B28C6E10300C653E1 /* PBXContainerItemProxy */; }; + B3991616295FA96300136B2C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B3991615295FA96300136B2C /* AltSign-Dynamic */; + }; BFF7C90E257844C900E55F36 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = BFF7C903257844C900E55F36 /* AltXPC */; @@ -1254,6 +1259,7 @@ "\"PACKAGE_STRING=\\\"AltServer 1.0\\\"\"", ); HEADER_SEARCH_PATHS = ( + "$(inherited)", "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/ldid/libplist/include\"", "\"$(SRCROOT)/Dependencies/libimobiledevice\"", "\"$(SRCROOT)/Dependencies/libimobiledevice/include\"", @@ -1308,6 +1314,7 @@ "\"PACKAGE_STRING=\\\"AltServer 1.0\\\"\"", ); HEADER_SEARCH_PATHS = ( + "$(inherited)", "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/ldid/libplist/include\"", "\"$(SRCROOT)/Dependencies/libimobiledevice\"", "\"$(SRCROOT)/Dependencies/libimobiledevice/include\"", @@ -1355,6 +1362,7 @@ ); GCC_WARN_INHIBIT_ALL_WARNINGS = YES; HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/libzip/xcode\"", "\"$(SRCROOT)/Dependencies/libplist/include\"", "\"$(SRCROOT)/Dependencies/libimobiledevice\"", "\"$(SRCROOT)/Dependencies/libimobiledevice/include\"", @@ -1363,7 +1371,7 @@ "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/libzip/lib\"", "\"$(SRCROOT)/Dependencies/libplist/libcnary/include\"", "\"${SDKROOT}/usr/include/libxml2\"", - "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/libzip/xcode\"", + "$(inherited)", ); MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_NAME = imobiledevice; @@ -1393,6 +1401,7 @@ ); GCC_WARN_INHIBIT_ALL_WARNINGS = YES; HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/libzip/xcode\"", "\"$(SRCROOT)/Dependencies/libplist/include\"", "\"$(SRCROOT)/Dependencies/libimobiledevice\"", "\"$(SRCROOT)/Dependencies/libimobiledevice/include\"", @@ -1401,7 +1410,7 @@ "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/libzip/lib\"", "\"$(SRCROOT)/Dependencies/libplist/libcnary/include\"", "\"${SDKROOT}/usr/include/libxml2\"", - "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/libzip/xcode\"", + "$(inherited)", ); MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_NAME = imobiledevice; @@ -1523,6 +1532,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/OpenSSL/iphoneos/include\"", + ); IPHONEOS_DEPLOYMENT_TARGET = 12.2; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1585,6 +1598,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/Dependencies/AltSign/Dependencies/OpenSSL/iphoneos/include\"", + ); IPHONEOS_DEPLOYMENT_TARGET = 12.2; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -1763,6 +1780,10 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + B3991615295FA96300136B2C /* AltSign-Dynamic */ = { + isa = XCSwiftPackageProductDependency; + productName = "AltSign-Dynamic"; + }; B3C395FB284F3B2400DA9E2F /* Sparkle */ = { isa = XCSwiftPackageProductDependency; package = B3C395FA284F3B2400DA9E2F /* XCRemoteSwiftPackageReference "Sparkle" */; From 5fcad049cebc3b9ca5e669aa57afb231d22f6931 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Fri, 30 Dec 2022 18:20:11 -0500 Subject: [PATCH 6/9] fix xcode ver Signed-off-by: Joseph Mattello --- .github/workflows/build_app.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index f198750..7482960 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -10,7 +10,6 @@ on: env: SCHEME: AltServer - XCTOOL_XCODE_VERSION: 14.2 jobs: master_deploy: @@ -25,7 +24,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.4.1 with: - xcode-version: ${ XCTOOL_XCODE_VERSION } + xcode-version: 14.2 - name: Set environment variables from project settings run: | From 3f5e27ba05a64dee49092af733720739347964be Mon Sep 17 00:00:00 2001 From: f1shy-dev <56125930+f1shy-dev@users.noreply.github.com> Date: Sat, 31 Dec 2022 14:22:49 +0000 Subject: [PATCH 7/9] install openssl in runner --- .github/workflows/build_app.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index 7482960..bd812cc 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -38,6 +38,9 @@ jobs: set-env-from-proj PRODUCT_NAME set-env-from-proj PROJECT_NAME + - name: Install OpenSSL + run: brew install openssl + - name: Build and install app run: | xcodebuild -project AltStore.xcodeproj \ From 7e0e2d8a2b964e43d234626eccb9741207528505 Mon Sep 17 00:00:00 2001 From: f1shy-dev <56125930+f1shy-dev@users.noreply.github.com> Date: Wed, 11 Jan 2023 19:52:33 +0000 Subject: [PATCH 8/9] openssl fix part 2 --- .github/workflows/build_app.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index bd812cc..2af9e3b 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -39,7 +39,8 @@ jobs: set-env-from-proj PROJECT_NAME - name: Install OpenSSL - run: brew install openssl + run: | + brew install openssl - name: Build and install app run: | @@ -53,6 +54,8 @@ jobs: DEVELOPMENT_TEAM=XYZ0123456 \ ORG_IDENTIFIER=com.SideStore \ DSTROOT=build/root \ + LDFLAGS="-L/usr/local/opt/openssl@3/lib" \ + CPPFLAGS="-I/usr/local/opt/openssl@3/include" | xcpretty && exit ${PIPESTATUS[0]} - name: Package app From effcc2c2aa0a1bc737dfc7a4800fa51db0b2c111 Mon Sep 17 00:00:00 2001 From: f1shy-dev <56125930+f1shy-dev@users.noreply.github.com> Date: Wed, 11 Jan 2023 20:11:20 +0000 Subject: [PATCH 9/9] brew openssl??? env stuff --- .github/workflows/build_app.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_app.yml b/.github/workflows/build_app.yml index 2af9e3b..61bff20 100644 --- a/.github/workflows/build_app.yml +++ b/.github/workflows/build_app.yml @@ -28,8 +28,9 @@ jobs: - name: Set environment variables from project settings run: | + BUILD_SETTINGS=$(xcodebuild -scheme "AltServer" -showBuildSettings) function set-env-from-proj { - echo "$1=$(xcodebuild -scheme "AltServer" -showBuildSettings | grep " $1 " | sed "s/[ ]*$1 = //")" >> $GITHUB_ENV + echo "$1=$(echo $BUILD_SETTINGS | grep " $1 " | sed "s/[ ]*$1 = //")" >> $GITHUB_ENV } set-env-from-proj FULL_PRODUCT_NAME set-env-from-proj INSTALL_PATH @@ -40,7 +41,12 @@ jobs: - name: Install OpenSSL run: | - brew install openssl + brew install openssl@3 + LD_LIBRARY_PATH=/usr/local/opt/openssl@3/lib:"${LD_LIBRARY_PATH}" + CPATH=/usr/local/opt/openssl@3/include:"${CPATH}" + PKG_CONFIG_PATH=/usr/local/opt/openssl@3/lib/pkgconfig:"${PKG_CONFIG_PATH}" + export LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH + echo "OPENSSL_LDFLAGS=$(pkg-config openssl --libs)" >> $GITHUB_ENV - name: Build and install app run: | @@ -54,8 +60,8 @@ jobs: DEVELOPMENT_TEAM=XYZ0123456 \ ORG_IDENTIFIER=com.SideStore \ DSTROOT=build/root \ - LDFLAGS="-L/usr/local/opt/openssl@3/lib" \ - CPPFLAGS="-I/usr/local/opt/openssl@3/include" + OTHER_LDFLAGS="-L/usr/local/opt/openssl@3/lib $OPENSSL_LDFLAGS" \ + OTHER_CPPFLAGS="-I/usr/local/opt/openssl@3/include" | xcpretty && exit ${PIPESTATUS[0]} - name: Package app