diff --git a/.github/workflows/ios-build-custom-dev-app.yml b/.github/workflows/ios-build-custom-dev-app.yml index 0b9ecdd8..5de2a876 100644 --- a/.github/workflows/ios-build-custom-dev-app.yml +++ b/.github/workflows/ios-build-custom-dev-app.yml @@ -9,13 +9,13 @@ on: jobs: build: - runs-on: macos-latest + runs-on: macos-26 steps: - uses: actions/checkout@v3 - name: switch XCode to 16.4 run: | - sudo xcode-select -s /Applications/Xcode_16.4.app + sudo xcode-select -s /Applications/Xcode_26.2.app - name: update bundle identifier in Dev config shell: bash @@ -42,13 +42,6 @@ jobs: run: pod install working-directory: ./ios - - name: appcenter prebuilt script test - shell: bash - working-directory: ./ - run: | - chmod +x ./appcenter-pre-build.sh - APPCENTER_XCODE_SCHEME="nativeTemplate" APPCENTER_SOURCE_DIRECTORY="./" IS_DEV_APP=False ./appcenter-pre-build.sh - - name: iOS Build Action uses: yukiarrr/ios-build-action@v1.12.0 with: diff --git a/appcenter-build-config.json b/appcenter-build-config.json deleted file mode 100644 index 90494fa8..00000000 --- a/appcenter-build-config.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "ios": { - "trigger": "manual", - "testEnabled": false, - "signed": false, - "environmentVariables": [ - { "name": "CODE_PUSH_KEY", "value": "" }, - { "name": "IS_DEV_APP", "value": false }, - { "name": "SUPPORTS_MOBILE_TOOLKIT", "value": false } - ], - "toolsets": { - "xcode": { - "xcodeVersion": "15.4", - "automaticSigning": false, - "projectOrWorkspacePath": "ios/NativeTemplate.xcworkspace", - "podfilePath": "ios/Podfile", - "scheme": "nativeTemplate" - }, - "javascript": { - "packageJsonPath": "package.json", - "runTests": false, - "nodeVersion": "18.x" - }, - "buildscripts": { - "package.json": { - "postClone": "appcenter-post-clone.sh", - "preBuild": "appcenter-pre-build.sh" - } - } - } - }, - "android": { - "trigger": "manual", - "testEnabled": false, - "signed": false, - "environmentVariables": [ - { "name": "CODE_PUSH_KEY", "value": "" }, - { "name": "IS_DEV_APP", "value": false }, - { "name": "SUPPORTS_MOBILE_TOOLKIT", "value": false }, - { "name": "JAVA_HOME", "value": "$(JAVA_HOME_17_X64)" } - ], - "toolsets": { - "android": { - "module": "app", - "buildVariant": "appstoreDebug", - "isRoot": false, - "runTests": false, - "runLint": false, - "automaticSigning": false, - "gradleWrapperPath": "android/gradlew" - }, - "javascript": { - "packageJsonPath": "package.json", - "runTests": false, - "nodeVersion": "18.x" - }, - "buildscripts": { - "package.json": { - "postClone": "appcenter-post-clone.sh", - "preBuild": "appcenter-pre-build.sh" - } - } - } - } -} diff --git a/appcenter-post-clone.sh b/appcenter-post-clone.sh deleted file mode 100755 index b827ca08..00000000 --- a/appcenter-post-clone.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -set -e - -# Untar bundle resources -if [ -f "./android/res.tar.gz" ]; then - tar xvzf "./android/res.tar.gz" -C "./android/app/src/main/res" && sudo find "./android/app/src/main/res/." -type d -exec chmod u+rwx {} \; -fi - -# # Untar bundle resources -if [ -f "./ios/Bundle/assets.tar.gz" ]; then - mkdir "./ios/Bundle/assets" - tar xvzf "./ios/Bundle/assets.tar.gz" -C "./ios/Bundle/assets" && sudo find "./ios/Bundle/assets/." -type d -exec chmod u+rwx {} \; -fi diff --git a/appcenter-pre-build.sh b/appcenter-pre-build.sh deleted file mode 100755 index 666d3266..00000000 --- a/appcenter-pre-build.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -export JAVA_HOME=${JAVA_HOME_17_X64} -export PATH=${JAVA_HOME}/bin:${PATH} - -if [[ $SUPPORTS_MOBILE_TOOLKIT == True ]]; then - echo "Configuring template with mobile toolkit" - npm run configure -fi - -INFO_PLIST=$APPCENTER_SOURCE_DIRECTORY/ios/$APPCENTER_XCODE_SCHEME/Info.plist -if [[ -e "$INFO_PLIST" && $IS_DEV_APP == False ]]; then - echo "Removing old MendixNative lib" - rm -rf $APPCENTER_SOURCE_DIRECTORY/ios/MendixNative - echo "Stripping references of old MendixNative (i386, x86_64, arm64) archs" - LIB_PATH=$APPCENTER_SOURCE_DIRECTORY/ios/MendixNative/libMendix.a - lipo -remove arm64 -output $LIB_PATH $LIB_PATH || true - lipo -remove x86_64 -output $LIB_PATH $LIB_PATH || true - lipo -remove i386 -output $LIB_PATH $LIB_PATH || true - lipo -info $LIB_PATH || true - - cat $INFO_PLIST -fi - -CODE_PUSH_KEY_FILE=$APPCENTER_SOURCE_DIRECTORY/android/app/src/main/res/raw/code_push_key -if [[ -e "$CODE_PUSH_KEY_FILE" && $IS_DEV_APP == False ]]; then - echo "Updating Android code_push_key resource file with code push key" - sed -i '' 's/.*/'$CODE_PUSH_KEY'/' $CODE_PUSH_KEY_FILE; - - cat $CODE_PUSH_KEY_FILE -fi