Skip to content

Commit 4f464b0

Browse files
Fixed up workflow errors
1 parent 684bfdc commit 4f464b0

File tree

4 files changed

+111
-96
lines changed

4 files changed

+111
-96
lines changed

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
4444
- name: Build Documentation
4545
run: |
46-
xcodebuild docbuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -destination "generic/platform=iOS" SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build.log"
46+
xcodebuild docbuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -destination "generic/platform=iOS" SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build.log"
4747
4848
- name: Upload Logs
4949
uses: actions/upload-artifact@v3

.github/workflows/upload-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
107107
- name: Build
108108
run: |
109-
xcodebuild docbuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -destination "generic/platform=iOS" -derivedDataPath "${TMPDIR}/.docbuild" 2>&1 | tee "${TMPDIR}/Logs/Build.log"
109+
xcodebuild docbuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -destination "generic/platform=iOS" -derivedDataPath "${TMPDIR}/.docbuild" 2>&1 | tee "${TMPDIR}/Logs/Build.log"
110110
111111
DOCC_ARCHIVE="$(find "${TMPDIR}/.docbuild" -type d -name "CBORCoding.doccarchive")"
112112
mv "${DOCC_ARCHIVE%/}" "${TMPDIR}/Output/CBORCoding.doccarchive"

.github/workflows/xcodebuild.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ jobs:
5252
5353
- name: Build iOS
5454
run: |
55-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -destination "generic/platform=iOS" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-ios.log"
55+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -destination "generic/platform=iOS" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-ios.log"
5656
5757
- name: Build iOS Simulator
5858
run: |
59-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -destination "generic/platform=iOS Simulator" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-iossimulator.log"
59+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -destination "generic/platform=iOS Simulator" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-iossimulator.log"
6060
6161
- name: Test
6262
run: |
@@ -65,7 +65,7 @@ jobs:
6565
IOS_SIM="iPhone 12 Pro" # Fallback Simulator
6666
fi
6767
68-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -testPlan "CBORCodingTests" -destination "platform=iOS Simulator,name=$IOS_SIM" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-ios.log"
68+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -testPlan "CBORCodingTests" -destination "platform=iOS Simulator,name=$IOS_SIM" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-ios.log"
6969
7070
- name: Upload Logs
7171
uses: actions/upload-artifact@v3
@@ -102,11 +102,11 @@ jobs:
102102
103103
- name: Build
104104
run: |
105-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -destination "generic/platform=macOS,variant=Mac Catalyst" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-maccatalyst.log"
105+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -destination "generic/platform=macOS,variant=Mac Catalyst" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-maccatalyst.log"
106106
107107
- name: Test
108108
run: |
109-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -testPlan "CBORCodingTests" -destination "platform=macOS,variant=Mac Catalyst" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-maccatalyst.log"
109+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -testPlan "CBORCodingTests" -destination "platform=macOS,variant=Mac Catalyst" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-maccatalyst.log"
110110
111111
- name: Upload Logs
112112
uses: actions/upload-artifact@v3
@@ -143,11 +143,11 @@ jobs:
143143
144144
- name: Build
145145
run: |
146-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding macOS" -destination "generic/platform=macOS" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-macos.log"
146+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding macOS" -destination "generic/platform=macOS" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-macos.log"
147147
148148
- name: Test
149149
run: |
150-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding macOS" -testPlan "CBORCoding macOS Tests" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-macos.log"
150+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding macOS" -testPlan "CBORCoding macOS Tests" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-macos.log"
151151
152152
- name: Upload Logs
153153
uses: actions/upload-artifact@v3
@@ -184,11 +184,11 @@ jobs:
184184
185185
- name: Build tvOS
186186
run: |
187-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding tvOS" -destination "generic/platform=tvOS" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-tvos.log"
187+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding tvOS" -destination "generic/platform=tvOS" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-tvos.log"
188188
189189
- name: Build tvOS Simulator
190190
run: |
191-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding tvOS" -destination "generic/platform=tvOS Simulator" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-tvossimulator.log"
191+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding tvOS" -destination "generic/platform=tvOS Simulator" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-tvossimulator.log"
192192
193193
- name: Test
194194
run: |
@@ -197,7 +197,7 @@ jobs:
197197
TVOS_SIM="Apple TV" # Fallback Simulator
198198
fi
199199
200-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding tvOS" -testPlan "CBORCoding tvOS Tests" -destination "platform=tvOS Simulator,name=$TVOS_SIM" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-tvos.log"
200+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding tvOS" -testPlan "CBORCoding tvOS Tests" -destination "platform=tvOS Simulator,name=$TVOS_SIM" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-tvos.log"
201201
202202
- name: Upload Logs
203203
uses: actions/upload-artifact@v3
@@ -234,11 +234,11 @@ jobs:
234234
235235
- name: Build watchOS
236236
run: |
237-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding watchOS" -destination "generic/platform=watchOS" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-watchos.log"
237+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding watchOS" -destination "generic/platform=watchOS" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-watchos.log"
238238
239239
- name: Build watchOS Simulator
240240
run: |
241-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding watchOS" -destination "generic/platform=watchOS Simulator" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-watchossimulator.log"
241+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding watchOS" -destination "generic/platform=watchOS Simulator" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build-watchossimulator.log"
242242
243243
- name: Test
244244
run: |
@@ -247,7 +247,7 @@ jobs:
247247
WATCHOS_SIM="Apple Watch Series 6 - 44mm" # Fallback Simulator
248248
fi
249249
250-
xcodebuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding watchOS" -testPlan "CBORCoding watchOS Tests" -destination "platform=watchOS Simulator,name=$WATCHOS_SIM" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-watchos.log"
250+
xcodebuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding watchOS" -testPlan "CBORCoding watchOS Tests" -destination "platform=watchOS Simulator,name=$WATCHOS_SIM" -configuration Debug RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES ONLY_ACTIVE_ARCH=YES test 2>&1 | tee "$LOGSDIR/test-watchos.log"
251251
252252
- name: Upload Logs
253253
uses: actions/upload-artifact@v3

scripts/xcframework.sh

Lines changed: 96 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,61 @@ function printhelp() {
7777
exit $EXIT_CODE
7878
}
7979

80+
# Function Declarations
81+
82+
function cleanup() {
83+
cd "$CURRENT_DIR"
84+
if [[ "$VERBOSE" != "1" && "$BUILD_DIR_IS_TEMP" == "1" && ("$NO_CLEAN" == "1" || ("$NO_CLEAN_ON_FAIL" == "1" && "$EXIT_CODE" != "0")) ]]; then
85+
if [ "$EXIT_CODE" == "0" ]; then
86+
"$SCRIPTS_DIR/printformat.sh" "foreground:yellow" "Build Directory: $BUILD_DIR"
87+
fi
88+
elif [ "$BUILD_DIR_IS_TEMP" == "1" ]; then
89+
rm -rf "$BUILD_DIR"
90+
fi
91+
92+
#
93+
94+
if [ "${#EXIT_MESSAGE}" != 0 ]; then
95+
echo -e "$EXIT_MESSAGE" 1>&2
96+
fi
97+
98+
exit $EXIT_CODE
99+
}
100+
101+
function checkresult() {
102+
if [ "$1" != "0" ]; then
103+
if [ "${#2}" != "0" ]; then
104+
EXIT_MESSAGE="$("$SCRIPTS_DIR/printformat.sh" "foreground:red" "$2")"
105+
fi
106+
107+
EXIT_CODE=$1
108+
cleanup
109+
fi
110+
}
111+
112+
function createlogfile() {
113+
if [ ! -d "$BUILD_DIR/Logs" ]; then
114+
mkdir -p "$BUILD_DIR/Logs"
115+
fi
116+
117+
local LOG="$BUILD_DIR/Logs/$1.log"
118+
touch "$LOG"
119+
120+
echo "$LOG"
121+
}
122+
123+
function errormessage() {
124+
local ERROR_MESSAGE=""
125+
126+
if [[ "$NO_CLEAN" == "1" ]] || [[ "$NO_CLEAN_ON_FAIL" == "1" ]]; then
127+
ERROR_MESSAGE="$("$SCRIPTS_DIR/printformat.sh" "foreground:default" "Build Failed. See xcodebuild log for more details: $("$SCRIPTS_DIR/printformat.sh" "foreground:yellow" "$1")")"
128+
elif [ "$VERBOSE" != "1" ]; then
129+
ERROR_MESSAGE="$("$SCRIPTS_DIR/printformat.sh" "foreground:default" "Build Failed. Use the '--no-clean' or '--no-clean-on-fail' flag to inspect the logs.")"
130+
fi
131+
132+
echo "$ERROR_MESSAGE"
133+
}
134+
80135
# Parse Arguments
81136

82137
while [[ $# -gt 0 ]]; do
@@ -158,11 +213,39 @@ done
158213
if [ "${#WORKSPACE_NAME}" != 0 ]; then
159214
USE_WORKSPACE=1
160215
WORKSPACE_NAME="$("$SCRIPTS_DIR/findworkspace.sh" --workspace-name "$WORKSPACE_NAME")"
161-
FRAMEWORK_NAME="$WORKSPACE_NAME"
216+
217+
checkresult $?
162218
elif [ "${#PROJECT_NAME}" != 0 ]; then
163219
USE_WORKSPACE=0
164220
PROJECT_NAME="$("$SCRIPTS_DIR/findproject.sh" --project-name "$PROJECT_NAME")"
165-
FRAMEWORK_NAME="$PROJECT_NAME"
221+
222+
checkresult $?
223+
else
224+
WORKSPACE_NAME="$("$SCRIPTS_DIR/findworkspace.sh")" 2> /dev/null
225+
RESULT=$?
226+
227+
if [[ "$RESULT" == 0 ]] && [[ "${#WORKSPACE_NAME}" != 0 ]]; then
228+
USE_WORKSPACE=1
229+
else
230+
PROJECT_NAME="$("$SCRIPTS_DIR/findproject.sh")" 2> /dev/null
231+
RESULT=$?
232+
233+
if [[ "$RESULT" == 0 ]] && [[ "${#PROJECT_NAME}" != 0 ]]; then
234+
USE_WORKSPACE=0
235+
else
236+
checkresult 1 "Unable to find specific Xcode project or workspace in the root directory. Try specifying a project or workspace name:\n"
237+
fi
238+
fi
239+
fi
240+
241+
if [ "$USE_WORKSPACE" == "1" ]; then
242+
PRODUCT_NAME="$WORKSPACE_NAME"
243+
FULL_PRODUCT_NAME="$WORKSPACE_NAME.xcworkspace"
244+
XCODEBUILD_ARGS=(-workspace "$FULL_PRODUCT_NAME")
245+
else
246+
PRODUCT_NAME="$PROJECT_NAME"
247+
FULL_PRODUCT_NAME="$PROJECT_NAME.xcodeproj"
248+
XCODEBUILD_ARGS=(-project "$FULL_PRODUCT_NAME")
166249
fi
167250

168251
EXIT_CODE=$?
@@ -174,12 +257,12 @@ fi
174257
#
175258

176259
if [ -z ${OUTPUT+x} ]; then
177-
OUTPUT="$SCRIPTS_DIR/build/$FRAMEWORK_NAME.xcframework"
260+
OUTPUT="$SCRIPTS_DIR/build/$PRODUCT_NAME.xcframework"
178261
elif [ "${OUTPUT##*.}" != "xcframework" ]; then
179262
if [ "${OUTPUT: -1}" == "/" ]; then
180-
OUTPUT="${OUTPUT}${FRAMEWORK_NAME}.xcframework"
263+
OUTPUT="${OUTPUT}${PRODUCT_NAME}.xcframework"
181264
else
182-
OUTPUT="${OUTPUT}/${FRAMEWORK_NAME}.xcframework"
265+
OUTPUT="${OUTPUT}/${PRODUCT_NAME}.xcframework"
183266
fi
184267
fi
185268

@@ -190,7 +273,7 @@ if [ -z ${CONFIGURATION+x} ]; then
190273
fi
191274

192275
if [ -z ${BUILD_DIR+x} ]; then
193-
BUILD_DIR="$(mktemp -d -t ".$(echo "$FRAMEWORK_NAME" | tr '[:upper:]' '[:lower:]').xcframework.build")"
276+
BUILD_DIR="$(mktemp -d -t ".$(echo "$PRODUCT_NAME" | tr '[:upper:]' '[:lower:]').xcframework.build")"
194277
BUILD_DIR_IS_TEMP=1
195278
else
196279
mkdir -p "$BUILD_DIR"
@@ -202,76 +285,16 @@ else
202285
fi
203286
fi
204287

205-
# Function Declarations
206-
207-
function cleanup() {
208-
cd "$CURRENT_DIR"
209-
if [[ "$VERBOSE" != "1" && "$BUILD_DIR_IS_TEMP" == "1" && ("$NO_CLEAN" == "1" || ("$NO_CLEAN_ON_FAIL" == "1" && "$EXIT_CODE" != "0")) ]]; then
210-
if [ "$EXIT_CODE" == "0" ]; then
211-
"$SCRIPTS_DIR/printformat.sh" "foreground:yellow" "Build Directory: $BUILD_DIR"
212-
fi
213-
elif [ "$BUILD_DIR_IS_TEMP" == "1" ]; then
214-
rm -rf "$BUILD_DIR"
215-
fi
216-
217-
#
218-
219-
if [ "${#EXIT_MESSAGE}" != 0 ]; then
220-
echo -e "$EXIT_MESSAGE" 1>&2
221-
fi
222-
223-
exit $EXIT_CODE
224-
}
225-
226-
function checkresult() {
227-
if [ "$1" != "0" ]; then
228-
if [ "${#2}" != "0" ]; then
229-
EXIT_MESSAGE="$("$SCRIPTS_DIR/printformat.sh" "foreground:red" "$2")"
230-
fi
231-
232-
EXIT_CODE=$1
233-
cleanup
234-
fi
235-
}
236-
237-
function createlogfile() {
238-
if [ ! -d "$BUILD_DIR/Logs" ]; then
239-
mkdir -p "$BUILD_DIR/Logs"
240-
fi
241-
242-
local LOG="$BUILD_DIR/Logs/$1.log"
243-
touch "$LOG"
244-
245-
echo "$LOG"
246-
}
247-
248-
function errormessage() {
249-
local ERROR_MESSAGE=""
250-
251-
if [[ "$NO_CLEAN" == "1" ]] || [[ "$NO_CLEAN_ON_FAIL" == "1" ]]; then
252-
ERROR_MESSAGE="$("$SCRIPTS_DIR/printformat.sh" "foreground:default" "Build Failed. See xcodebuild log for more details: $("$SCRIPTS_DIR/printformat.sh" "foreground:yellow" "$1")")"
253-
elif [ "$VERBOSE" != "1" ]; then
254-
ERROR_MESSAGE="$("$SCRIPTS_DIR/printformat.sh" "foreground:default" "Build Failed. Use the '--no-clean' or '--no-clean-on-fail' flag to inspect the logs.")"
255-
fi
256-
257-
echo "$ERROR_MESSAGE"
258-
}
259-
260288
# Build Platforms
261289

262290
cd "$ROOT_DIR"
263291

264292
#
265293

266294
for PLATFORM in "iOS" "iOS Simulator" "Mac Catalyst" "macOS" "tvOS" "tvOS Simulator" "watchOS" "watchOS Simulator"; do
267-
if [ "$USE_WORKSPACE" == "1" ]; then
268-
SCHEME="${WORKSPACE_NAME}"
269-
echo -e "$("$SCRIPTS_DIR/printformat.sh" "foreground:blue" "***") Building $("$SCRIPTS_DIR/printformat.sh" "foreground:green" "$PLATFORM") architecture(s) of $("$SCRIPTS_DIR/printformat.sh" "bold" "${WORKSPACE_NAME}.xcworkspace")"
270-
else
271-
SCHEME="${PROJECT_NAME}"
272-
echo -e "$("$SCRIPTS_DIR/printformat.sh" "foreground:blue" "***") Building $("$SCRIPTS_DIR/printformat.sh" "foreground:green" "$PLATFORM") architecture(s) of $("$SCRIPTS_DIR/printformat.sh" "bold" "${PROJECT_NAME}.xcodeproj")"
273-
fi
295+
echo -e "$("$SCRIPTS_DIR/printformat.sh" "foreground:blue" "***") Building $("$SCRIPTS_DIR/printformat.sh" "foreground:green" "$PLATFORM") architecture(s) of $("$SCRIPTS_DIR/printformat.sh" "bold" "$FULL_PRODUCT_NAME")"
274296

297+
SCHEME="${PRODUCT_NAME}"
275298
ARCHIVE=""
276299
ARCHS=""
277300

@@ -328,22 +351,14 @@ for PLATFORM in "iOS" "iOS Simulator" "Mac Catalyst" "macOS" "tvOS" "tvOS Simula
328351
#
329352

330353
if [ "$VERBOSE" == "1" ]; then
331-
if [ "$USE_WORKSPACE" == "1" ]; then
332-
xcodebuild -workspace "${WORKSPACE_NAME}.xcworkspace" -scheme "$SCHEME" -destination "generic/platform=$PLATFORM" -archivePath "${BUILD_DIR}/$ARCHIVE.xcarchive" -configuration ${CONFIGURATION} SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ONLY_ACTIVE_ARCH=NO ARCHS="$ARCHS" "${BUILD_ARGS[@]}" archive
333-
else
334-
xcodebuild -project "${PROJECT_NAME}.xcodeproj" -scheme "$SCHEME" -destination "generic/platform=$PLATFORM" -archivePath "${BUILD_DIR}/$ARCHIVE.xcarchive" -configuration ${CONFIGURATION} SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ONLY_ACTIVE_ARCH=NO ARCHS="$ARCHS" "${BUILD_ARGS[@]}" archive
335-
fi
354+
xcodebuild "${XCODEBUILD_ARGS[@]}" -scheme "$SCHEME" -destination "generic/platform=$PLATFORM" -archivePath "${BUILD_DIR}/$ARCHIVE.xcarchive" -configuration ${CONFIGURATION} SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ONLY_ACTIVE_ARCH=NO ARCHS="$ARCHS" "${BUILD_ARGS[@]}" archive
336355
else
337356
LOG="$(createlogfile "$ARCHIVE-build")"
338357
ERROR_MESSAGE="$(errormessage "$LOG")"
339358

340359
#
341360

342-
if [ "$USE_WORKSPACE" == "1" ]; then
343-
xcodebuild -workspace "${WORKSPACE_NAME}.xcworkspace" -scheme "$SCHEME" -destination "generic/platform=$PLATFORM" -archivePath "${BUILD_DIR}/$ARCHIVE.xcarchive" -configuration ${CONFIGURATION} SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ONLY_ACTIVE_ARCH=NO ARCHS="$ARCHS" "${BUILD_ARGS[@]}" archive > "$LOG" 2>&1
344-
else
345-
xcodebuild -project "${PROJECT_NAME}.xcodeproj" -scheme "$SCHEME" -destination "generic/platform=$PLATFORM" -archivePath "${BUILD_DIR}/$ARCHIVE.xcarchive" -configuration ${CONFIGURATION} SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ONLY_ACTIVE_ARCH=NO ARCHS="$ARCHS" "${BUILD_ARGS[@]}" archive > "$LOG" 2>&1
346-
fi
361+
xcodebuild "${XCODEBUILD_ARGS[@]}" -scheme "$SCHEME" -destination "generic/platform=$PLATFORM" -archivePath "${BUILD_DIR}/$ARCHIVE.xcarchive" -configuration ${CONFIGURATION} SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ONLY_ACTIVE_ARCH=NO ARCHS="$ARCHS" "${BUILD_ARGS[@]}" archive > "$LOG" 2>&1
347362
fi
348363

349364
checkresult $? "$ERROR_MESSAGE"
@@ -358,11 +373,11 @@ fi
358373
ARGUMENTS=(-create-xcframework -output "$(readlink -f "$(dirname "${OUTPUT}")")/$(basename "${OUTPUT}")")
359374

360375
for ARCHIVE in ${BUILD_DIR}/*.xcarchive; do
361-
ARGUMENTS=(${ARGUMENTS[@]} -framework "$(readlink -f "${ARCHIVE}/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework")")
376+
ARGUMENTS=(${ARGUMENTS[@]} -framework "$(readlink -f "${ARCHIVE}/Products/Library/Frameworks/${PRODUCT_NAME}.framework")")
362377

363378
if [ "$EXCLUDE_DSYMS" != "1" ]; then
364-
if [[ -d "${ARCHIVE}/dSYMs/${FRAMEWORK_NAME}.framework.dSYM" ]]; then
365-
ARGUMENTS=(${ARGUMENTS[@]} -debug-symbols "$(readlink -f "${ARCHIVE}/dSYMs/${FRAMEWORK_NAME}.framework.dSYM")")
379+
if [[ -d "${ARCHIVE}/dSYMs/${PRODUCT_NAME}.framework.dSYM" ]]; then
380+
ARGUMENTS=(${ARGUMENTS[@]} -debug-symbols "$(readlink -f "${ARCHIVE}/dSYMs/${PRODUCT_NAME}.framework.dSYM")")
366381
fi
367382

368383
if [[ -d "${ARCHIVE}/BCSymbolMaps" ]]; then

0 commit comments

Comments
 (0)