fix: server mobile CI — Java paths, monorepo Podfile
Jenkins/서버에서 brew OpenJDK·Android SDK 경로를 사용하고, npm workspace 루트의 Capacitor iOS 의존성을 Podfile이 참조하도록 수정한다. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+3
-3
@@ -1,4 +1,4 @@
|
||||
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
|
||||
require_relative '../../../node_modules/@capacitor/ios/scripts/pods_helpers'
|
||||
|
||||
platform :ios, '14.0'
|
||||
use_frameworks!
|
||||
@@ -9,8 +9,8 @@ use_frameworks!
|
||||
install! 'cocoapods', :disable_input_output_paths => true
|
||||
|
||||
def capacitor_pods
|
||||
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
|
||||
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
|
||||
pod 'Capacitor', :path => '../../../node_modules/@capacitor/ios'
|
||||
pod 'CapacitorCordova', :path => '../../../node_modules/@capacitor/ios'
|
||||
end
|
||||
|
||||
target 'App' do
|
||||
|
||||
@@ -31,7 +31,7 @@ sign_release_apk() {
|
||||
local apksigner
|
||||
apksigner="${ANDROID_HOME:-$HOME/Library/Android/sdk}/build-tools/35.0.0/apksigner"
|
||||
if [[ ! -x "$apksigner" ]]; then
|
||||
apksigner=$(command -v apksigner 2>/dev/null || true)
|
||||
apksigner=$(ls -d "${ANDROID_HOME:-$HOME/Library/Android/sdk}"/build-tools/*/apksigner 2>/dev/null | sort -V | tail -1 || true)
|
||||
fi
|
||||
if [[ -z "$apksigner" || ! -x "$apksigner" ]]; then
|
||||
echo "apksigner 없음. Android SDK build-tools 설치 필요." >&2
|
||||
@@ -49,6 +49,13 @@ sign_release_apk() {
|
||||
if [[ -z "${JAVA_HOME:-}" ]] && [[ -x "$HOME/.local/jdk-21.0.11+10/Contents/Home/bin/java" ]]; then
|
||||
export JAVA_HOME="$HOME/.local/jdk-21.0.11+10/Contents/Home"
|
||||
fi
|
||||
if [[ -z "${JAVA_HOME:-}" ]] && [[ -x "/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home/bin/java" ]]; then
|
||||
export JAVA_HOME="/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home"
|
||||
fi
|
||||
if [[ -z "${JAVA_HOME:-}" ]] && command -v /usr/libexec/java_home >/dev/null 2>&1; then
|
||||
JAVA_HOME="$(/usr/libexec/java_home 2>/dev/null || true)"
|
||||
[[ -n "$JAVA_HOME" ]] && export JAVA_HOME
|
||||
fi
|
||||
if [[ -z "${JAVA_HOME:-}" ]]; then
|
||||
echo "JAVA_HOME 미설정" >&2
|
||||
exit 1
|
||||
|
||||
@@ -9,6 +9,13 @@ for prefix in "$HOME/homebrew" /opt/homebrew; do
|
||||
[[ -x "$prefix/bin/brew" ]] && eval "$("$prefix/bin/brew" shellenv)"
|
||||
done
|
||||
|
||||
if [[ -z "${ANDROID_HOME:-}" ]]; then
|
||||
export ANDROID_HOME="/Users/aidev/Library/Android/sdk"
|
||||
fi
|
||||
if [[ -z "${JAVA_HOME:-}" ]] && [[ -x "/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home/bin/java" ]]; then
|
||||
export JAVA_HOME="/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home"
|
||||
fi
|
||||
|
||||
log() { echo "[mobile-pipeline $(date '+%H:%M:%S')] $*"; }
|
||||
|
||||
log "=== goldenChart Mobile Pipeline #${BUILD_NUMBER:-local} ==="
|
||||
|
||||
@@ -53,8 +53,8 @@ export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:\$PATH"
|
||||
export WORK_TREE="${WORK_TREE}"
|
||||
export GIT_DIR="${GIT_DIR}"
|
||||
export BUILD_NUMBER="\${BUILD_NUMBER}"
|
||||
export ANDROID_HOME="\${ANDROID_HOME:-\$HOME/Library/Android/sdk}"
|
||||
export JAVA_HOME="\${JAVA_HOME:-\$HOME/.local/jdk-21.0.11+10/Contents/Home}"
|
||||
export ANDROID_HOME="\${ANDROID_HOME:-/Users/aidev/Library/Android/sdk}"
|
||||
export JAVA_HOME="\${JAVA_HOME:-/opt/homebrew/opt/openjdk@21/libexec/openjdk.jdk/Contents/Home}"
|
||||
"${WORK_TREE}/scripts/jenkins-mobile-pipeline.sh"
|
||||
</command>
|
||||
</hudson.tasks.Shell>
|
||||
|
||||
Reference in New Issue
Block a user