From e315dffab14112ae969e150887f2a85b26b4dfe1 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 06:49:37 +0300 Subject: [PATCH 01/21] build: update ios --- .github/actions/ios/action.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 1951bfa3..48c5a612 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -19,11 +19,6 @@ inputs: runs: using: "composite" steps: - - name: install pods - shell: bash - run: | - cd ./${CUSTOM_DIR}/ios - NO_FLIPPER=1 pod install - name: prepare shell: bash env: From 24dbd7b5f7a7686802b26fd3ef932ca804b2db2b Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 06:55:14 +0300 Subject: [PATCH 02/21] build: update ios x2 --- .github/actions/ios/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 48c5a612..ce4d4689 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -15,7 +15,6 @@ inputs: description: MYAPP_UPLOAD_STORE_PASSWORD required: true - runs: using: "composite" steps: From a0a17143c1c51469b7bd248059d6cf97ca63bf9f Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 07:11:35 +0300 Subject: [PATCH 03/21] build: test ios --- .github/actions/ios/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index ce4d4689..ed8ca2bd 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -33,6 +33,7 @@ runs: APP_STORE_API_ISSUER: ${{ inputs.APP_STORE_API_ISSUER }} APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | + cd ./${CUSTOM_DIR}/ios xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -allowProvisioningUpdates -quiet - name: exportArchive shell: bash @@ -41,6 +42,7 @@ runs: APP_STORE_API_ISSUER: ${{ inputs.APP_STORE_API_ISSUER }} APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | + cd ./${CUSTOM_DIR}/ios xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: publish shell: bash @@ -48,4 +50,5 @@ runs: APP_STORE_API_ISSUER: ${{ inputs.APP_STORE_API_ISSUER }} APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | + cd ./${CUSTOM_DIR}/ios xcrun altool --upload-app -f ./build/*.ipa -t ios --apiKey $APP_STORE_API_KEY --apiIssuer $APP_STORE_API_ISSUER From 05664e0a6a0a952c890ad9f589861c4b04f27deb Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 07:12:42 +0300 Subject: [PATCH 04/21] build: update naming --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 227c4cdf..530e29df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Checker +name: Release on: workflow_call: From 9f2be50d574a8695a5895f1c76707dbce7fe7b88 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 08:35:38 +0300 Subject: [PATCH 05/21] build: more ios logs --- .github/actions/android/action.yml | 1 - .github/actions/ios/action.yml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/android/action.yml b/.github/actions/android/action.yml index 533987c3..3454b7e9 100644 --- a/.github/actions/android/action.yml +++ b/.github/actions/android/action.yml @@ -18,7 +18,6 @@ inputs: description: GOOGLE_API_KEY required: true - runs: using: "composite" steps: diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index ed8ca2bd..db1d3b0d 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -34,7 +34,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -allowProvisioningUpdates -quiet + xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates - name: exportArchive shell: bash env: @@ -43,7 +43,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet + xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates - name: publish shell: bash env: From e812adbdabe0601d3cce28fcfef776fca383ffa2 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 08:44:54 +0300 Subject: [PATCH 06/21] build: update authenticationKeyPath --- .github/actions/ios/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index db1d3b0d..ecff2c4e 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -34,7 +34,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates + xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates - name: exportArchive shell: bash env: @@ -43,7 +43,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates + xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates - name: publish shell: bash env: From 315101974e3529fd6ea8282d7b73524ce64b7ece Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 08:55:04 +0300 Subject: [PATCH 07/21] build: add quiet --- .github/actions/ios/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index ecff2c4e..c9f5d056 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -34,7 +34,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates + xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: exportArchive shell: bash env: @@ -43,7 +43,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates + xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: publish shell: bash env: From 2add6da0a11b145fba64b210ea9e0156e9aad8d9 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 09:09:21 +0300 Subject: [PATCH 08/21] build: update android runner --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b249c6b8..53bc53a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: jobs: android: - runs-on: ubuntu-latest + runs-on: [self-hosted, macOS, ARM64, mobile] environment: production-android concurrency: android steps: From 8b28079603c46418c0d0bced853fee3979059a43 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 09:18:54 +0300 Subject: [PATCH 09/21] build: add forgotten import --- android/app/src/main/java/com/mobydick/MainActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/src/main/java/com/mobydick/MainActivity.kt b/android/app/src/main/java/com/mobydick/MainActivity.kt index 855e534b..9a7a7842 100644 --- a/android/app/src/main/java/com/mobydick/MainActivity.kt +++ b/android/app/src/main/java/com/mobydick/MainActivity.kt @@ -1,5 +1,6 @@ package com.mobydick +import android.os.Bundle; import com.facebook.react.ReactActivity import com.facebook.react.ReactActivityDelegate import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled From eef3112e7a752e3ea55609ad1d62e5294e1b5bf9 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 10:18:26 +0300 Subject: [PATCH 10/21] build: change order --- .github/workflows/build.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53bc53a4..1deb9a22 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,22 @@ on: workflow_dispatch: jobs: + ios: + runs-on: [ self-hosted, macOS, ARM64, mobile ] + environment: production-ios + concurrency: ios + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: install + uses: ./.github/actions/install + - name: ios + uses: ./.github/actions/ios + with: + EXPORT_OPTIONS: ${{ secrets.EXPORT_OPTIONS }} + IOS_SCHEME: ${{ secrets.IOS_SCHEME }} + APP_STORE_API_ISSUER: ${{ secrets.APP_STORE_API_ISSUER }} + APP_STORE_API_KEY: ${{ secrets.APP_STORE_API_KEY }} android: runs-on: [self-hosted, macOS, ARM64, mobile] environment: production-android @@ -22,19 +38,4 @@ jobs: MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }} - ios: - runs-on: [self-hosted, macOS, ARM64, mobile] - environment: production-ios - concurrency: ios - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - name: install - uses: ./.github/actions/install - - name: ios - uses: ./.github/actions/ios - with: - EXPORT_OPTIONS: ${{ secrets.EXPORT_OPTIONS }} - IOS_SCHEME: ${{ secrets.IOS_SCHEME }} - APP_STORE_API_ISSUER: ${{ secrets.APP_STORE_API_ISSUER }} - APP_STORE_API_KEY: ${{ secrets.APP_STORE_API_KEY }} + From 7e7ffd93dde56629b42dba97f2b22bad770b1a94 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 10:44:03 +0300 Subject: [PATCH 11/21] build: disable android --- .github/workflows/build.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1deb9a22..94d91f19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,21 +21,21 @@ jobs: IOS_SCHEME: ${{ secrets.IOS_SCHEME }} APP_STORE_API_ISSUER: ${{ secrets.APP_STORE_API_ISSUER }} APP_STORE_API_KEY: ${{ secrets.APP_STORE_API_KEY }} - android: - runs-on: [self-hosted, macOS, ARM64, mobile] - environment: production-android - concurrency: android - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - name: install - uses: ./.github/actions/install - - name: android - uses: ./.github/actions/android - with: - ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} - MYAPP_UPLOAD_KEY_ALIAS: ${{ secrets.MYAPP_UPLOAD_KEY_ALIAS }} - MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} - MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} - GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }} - +# android: +# runs-on: [self-hosted, macOS, ARM64, mobile] +# environment: production-android +# concurrency: android +# steps: +# - name: Checkout +# uses: actions/checkout@v4.1.1 +# - name: install +# uses: ./.github/actions/install +# - name: android +# uses: ./.github/actions/android +# with: +# ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} +# MYAPP_UPLOAD_KEY_ALIAS: ${{ secrets.MYAPP_UPLOAD_KEY_ALIAS }} +# MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} +# MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} +# GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }} +# From 259ab130a5e1693a7f4dc30e1974706710b78096 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 10:59:28 +0300 Subject: [PATCH 12/21] build: test ios --- .github/actions/ios/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index c9f5d056..127194ba 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -34,7 +34,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet + xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -quiet - name: exportArchive shell: bash env: From a64452618b2025b6ef29a9ffeeb1088c034fa44d Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 11:04:03 +0300 Subject: [PATCH 13/21] build: return flags --- .github/actions/ios/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 127194ba..c9f5d056 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -34,7 +34,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -quiet + xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: exportArchive shell: bash env: From 96001f188e3ef0117adb8ffdeaa9f859a26f5d63 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 12:58:34 +0300 Subject: [PATCH 14/21] build: add verbose --- .github/actions/ios/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index c9f5d056..37c70749 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -34,7 +34,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet + xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -verbose - name: exportArchive shell: bash env: @@ -43,7 +43,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet + xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -verbose - name: publish shell: bash env: From ab623809b24b01dbe6105ce620bede78c9791811 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 13:40:28 +0300 Subject: [PATCH 15/21] build: add xcpretty --- .github/actions/ios/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 37c70749..49d8128e 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -34,7 +34,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -verbose + xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet | xcpretty - name: exportArchive shell: bash env: @@ -43,7 +43,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -verbose + xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet | xcpretty - name: publish shell: bash env: From d33863d769fe672fae3691d263c8f94abc5701b5 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 13:53:06 +0300 Subject: [PATCH 16/21] build: add TEST --- .github/actions/ios/action.yml | 8 ++++++-- .github/workflows/build.yml | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 49d8128e..9754024f 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -14,6 +14,9 @@ inputs: APP_STORE_API_KEY: description: MYAPP_UPLOAD_STORE_PASSWORD required: true + TEST: + description: TEST + required: true runs: using: "composite" @@ -34,7 +37,8 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet | xcpretty + security unlock-keychain -p $TEST + xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: exportArchive shell: bash env: @@ -43,7 +47,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet | xcpretty + xcodebuild -exportArchive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -exportOptionsPlist ${PWD}/ExportOptions.plist -exportPath $PWD/build -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: publish shell: bash env: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94d91f19..487f14a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,7 @@ jobs: IOS_SCHEME: ${{ secrets.IOS_SCHEME }} APP_STORE_API_ISSUER: ${{ secrets.APP_STORE_API_ISSUER }} APP_STORE_API_KEY: ${{ secrets.APP_STORE_API_KEY }} + TEST: ${{ secrets.TEST }} # android: # runs-on: [self-hosted, macOS, ARM64, mobile] # environment: production-android From 72e26210bd9804d3c7e4c9829f4ee0f8cf459a94 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 13:56:16 +0300 Subject: [PATCH 17/21] build: add TEST x2 --- .github/actions/ios/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 9754024f..334ee84e 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -37,7 +37,7 @@ runs: APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} run: | cd ./${CUSTOM_DIR}/ios - security unlock-keychain -p $TEST + security unlock-keychain -p $TEST login.keychain xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: exportArchive shell: bash From da20fd90ecac011bc09850f0ef911bb21933ae17 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 14:01:05 +0300 Subject: [PATCH 18/21] build: add TEST x3 --- .github/actions/ios/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 334ee84e..05ecc8b3 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -35,6 +35,7 @@ runs: IOS_SCHEME: ${{ inputs.IOS_SCHEME }} APP_STORE_API_ISSUER: ${{ inputs.APP_STORE_API_ISSUER }} APP_STORE_API_KEY: ${{ inputs.APP_STORE_API_KEY }} + TEST: ${{ inputs.TEST }} run: | cd ./${CUSTOM_DIR}/ios security unlock-keychain -p $TEST login.keychain From 35ba3b20b8c4d9d86addc7f913eefe0d1f96c3c4 Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 14:19:15 +0300 Subject: [PATCH 19/21] build: add TEST x4 --- .github/actions/ios/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 05ecc8b3..2581af8e 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -38,7 +38,7 @@ runs: TEST: ${{ inputs.TEST }} run: | cd ./${CUSTOM_DIR}/ios - security unlock-keychain -p $TEST login.keychain +# security unlock-keychain -p $TEST login.keychain xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: exportArchive shell: bash From 4aeffb8fa543b80f1ce10287bdd6d162c3f9ecea Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 14:20:53 +0300 Subject: [PATCH 20/21] build: add TEST x5 --- .github/actions/ios/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index 2581af8e..b6c5633c 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -38,7 +38,6 @@ runs: TEST: ${{ inputs.TEST }} run: | cd ./${CUSTOM_DIR}/ios -# security unlock-keychain -p $TEST login.keychain xcodebuild -workspace ${IOS_SCHEME}.xcworkspace -scheme $IOS_SCHEME -sdk iphoneos archive -archivePath ${PWD}/build/${IOS_SCHEME}.xcarchive -authenticationKeyPath ~/private_keys/AuthKey_${APP_STORE_API_KEY}.p8 -authenticationKeyIssuerID $APP_STORE_API_ISSUER -authenticationKeyID $APP_STORE_API_KEY -allowProvisioningUpdates -quiet - name: exportArchive shell: bash From 18d56f5a789e2edb41333049f7df290b904338db Mon Sep 17 00:00:00 2001 From: Bibazavr Date: Sat, 27 Apr 2024 14:25:41 +0300 Subject: [PATCH 21/21] build: return android --- .github/actions/ios/action.yml | 3 --- .github/workflows/build.yml | 37 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/.github/actions/ios/action.yml b/.github/actions/ios/action.yml index b6c5633c..c9127e64 100644 --- a/.github/actions/ios/action.yml +++ b/.github/actions/ios/action.yml @@ -14,9 +14,6 @@ inputs: APP_STORE_API_KEY: description: MYAPP_UPLOAD_STORE_PASSWORD required: true - TEST: - description: TEST - required: true runs: using: "composite" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 487f14a9..1deb9a22 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,22 +21,21 @@ jobs: IOS_SCHEME: ${{ secrets.IOS_SCHEME }} APP_STORE_API_ISSUER: ${{ secrets.APP_STORE_API_ISSUER }} APP_STORE_API_KEY: ${{ secrets.APP_STORE_API_KEY }} - TEST: ${{ secrets.TEST }} -# android: -# runs-on: [self-hosted, macOS, ARM64, mobile] -# environment: production-android -# concurrency: android -# steps: -# - name: Checkout -# uses: actions/checkout@v4.1.1 -# - name: install -# uses: ./.github/actions/install -# - name: android -# uses: ./.github/actions/android -# with: -# ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} -# MYAPP_UPLOAD_KEY_ALIAS: ${{ secrets.MYAPP_UPLOAD_KEY_ALIAS }} -# MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} -# MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} -# GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }} -# + android: + runs-on: [self-hosted, macOS, ARM64, mobile] + environment: production-android + concurrency: android + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: install + uses: ./.github/actions/install + - name: android + uses: ./.github/actions/android + with: + ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} + MYAPP_UPLOAD_KEY_ALIAS: ${{ secrets.MYAPP_UPLOAD_KEY_ALIAS }} + MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} + MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} + GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }} +