Skip to content

Commit f91b84c

Browse files
emdobrinemdobrin
authored
Merge pull request #524 from adobe/main
Downmerge `main` -> `dev`
2 parents 4f8e48e + 30e5485 commit f91b84c

File tree

7 files changed

+79
-68
lines changed

7 files changed

+79
-68
lines changed

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Set update schedule for GitHub Actions
2+
3+
version: 2
4+
updates:
5+
6+
- package-ecosystem: "github-actions"
7+
# Checks for workflow files in .github/workflows
8+
directory: "/"
9+
schedule:
10+
interval: "daily"

‎.github/workflows/build-and-test.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,14 @@ on:
1818
jobs:
1919
build-and-test:
2020
name: "CI"
21-
uses: adobe/aepsdk-commons/.github/workflows/ios-build-and-test.yml@gha-ios-5.2.0
21+
uses: adobe/aepsdk-commons/.github/workflows/ios-build-and-test.yml@gha-ios-5.3.0
2222
with:
23-
ios-device-names: '["iPhone 15"]'
24-
ios-versions: '["18.1"]'
25-
tvos-device-names: '["Apple TV"]'
26-
tvos-versions: '["18.1"]'
2723
run-test-ios-unit: true
2824
run-test-ios-functional: true
2925
run-test-ios-integration: true
3026
run-test-tvos-unit: true
3127
run-test-tvos-functional: true
3228
run-build-xcframework-and-app: true
3329
enable-codecov: true
30+
result-bundle-path: build/reports
3431
secrets: inherit

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
release:
3737
permissions:
3838
contents: write
39-
uses: adobe/aepsdk-commons/.github/workflows/ios-release.yml@gha-ios-5.2.0
39+
uses: adobe/aepsdk-commons/.github/workflows/ios-release.yml@gha-ios-5.3.0
4040
with:
4141
tag: ${{ github.event.inputs.tag }}
4242
create-github-release: ${{ github.event.inputs.create-github-release == 'true' && 'AEPEdge' || '' }}

‎.github/workflows/update-versions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
permissions:
4343
contents: write
4444
pull-requests: write
45-
uses: adobe/aepsdk-commons/.github/workflows/versions.yml@gha-ios-5.2.0
45+
uses: adobe/aepsdk-commons/.github/workflows/versions.yml@gha-ios-5.3.0
4646
with:
4747
version: ${{ github.event.inputs.version }}
4848
branch: ${{ github.event.inputs.branch }}

‎.github/workflows/upstream-integration-test.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ run-name: ${{ inputs.id }}
7272
jobs:
7373
test-ios-integration:
7474
name: Integration Test (iOS)
75-
uses: adobe/aepsdk-commons/.github/workflows/ios-custom-command-build-and-test.yml@gha-ios-5.2.0
75+
uses: adobe/aepsdk-commons/.github/workflows/ios-custom-command-build-and-test.yml@gha-ios-5.3.0
7676
with:
7777
ios-device-names: ${{ inputs.ios-device-names }}
7878
ios-versions: ${{ inputs.ios-versions }}
7979
command: make integration-test-ios TAGS_MOBILE_PROPERTY_ID=${{ github.event.inputs.tags-mobile-property-id }} EDGE_LOCATION_HINT=${{ github.event.inputs.edge-location-hint }}
80-
enable-codecov: false
8180
secrets: inherit

‎Gemfile.lock‎

Lines changed: 48 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,27 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.1.3.2)
8+
activesupport (7.2.2.1)
99
base64
10+
benchmark (>= 0.3)
1011
bigdecimal
11-
concurrent-ruby (~> 1.0, >= 1.0.2)
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
1213
connection_pool (>= 2.2.5)
1314
drb
1415
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
1517
minitest (>= 5.1)
16-
mutex_m
17-
tzinfo (~> 2.0)
18-
addressable (2.8.6)
19-
public_suffix (>= 2.0.2, < 6.0)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
20+
addressable (2.8.7)
21+
public_suffix (>= 2.0.2, < 7.0)
2022
algoliasearch (1.27.5)
2123
httpclient (~> 2.8, >= 2.8.3)
2224
json (>= 1.5.1)
2325
atomos (0.1.3)
2426
base64 (0.2.0)
25-
bigdecimal (3.1.7)
27+
benchmark (0.4.0)
28+
bigdecimal (3.1.9)
2629
claide (1.1.0)
2730
cocoapods (1.14.3)
2831
addressable (~> 2.8)
@@ -62,47 +65,70 @@ GEM
6265
netrc (~> 0.11)
6366
cocoapods-try (1.2.0)
6467
colored2 (3.1.2)
65-
concurrent-ruby (1.2.3)
66-
connection_pool (2.4.1)
68+
concurrent-ruby (1.3.5)
69+
connection_pool (2.5.0)
6770
drb (2.2.1)
6871
escape (0.0.4)
6972
ethon (0.16.0)
7073
ffi (>= 1.15.0)
71-
ffi (1.16.3)
74+
ffi (1.17.1)
75+
ffi (1.17.1-aarch64-linux-gnu)
76+
ffi (1.17.1-aarch64-linux-musl)
77+
ffi (1.17.1-arm-linux-gnu)
78+
ffi (1.17.1-arm-linux-musl)
79+
ffi (1.17.1-arm64-darwin)
80+
ffi (1.17.1-x86-linux-gnu)
81+
ffi (1.17.1-x86-linux-musl)
82+
ffi (1.17.1-x86_64-darwin)
83+
ffi (1.17.1-x86_64-linux-gnu)
84+
ffi (1.17.1-x86_64-linux-musl)
7285
fourflusher (2.3.1)
7386
fuzzy_match (2.0.4)
7487
gh_inspector (1.1.3)
75-
httpclient (2.8.3)
76-
i18n (1.14.4)
88+
httpclient (2.9.0)
89+
mutex_m
90+
i18n (1.14.7)
7791
concurrent-ruby (~> 1.0)
78-
json (2.7.1)
79-
minitest (5.22.3)
92+
json (2.10.1)
93+
logger (1.6.6)
94+
minitest (5.25.4)
8095
molinillo (0.8.0)
81-
mutex_m (0.2.0)
82-
nanaimo (0.3.0)
96+
mutex_m (0.3.0)
97+
nanaimo (0.4.0)
8398
nap (1.1.0)
8499
netrc (0.11.0)
85100
nkf (0.2.0)
86101
public_suffix (4.0.7)
87-
rexml (3.2.6)
102+
rexml (3.4.1)
88103
ruby-macho (2.5.1)
104+
securerandom (0.4.1)
89105
typhoeus (1.4.1)
90106
ethon (>= 0.9.0)
91107
tzinfo (2.0.6)
92108
concurrent-ruby (~> 1.0)
93-
xcodeproj (1.24.0)
109+
xcodeproj (1.27.0)
94110
CFPropertyList (>= 2.3.3, < 4.0)
95111
atomos (~> 0.1.3)
96112
claide (>= 1.0.2, < 2.0)
97113
colored2 (~> 3.1)
98-
nanaimo (~> 0.3.0)
99-
rexml (~> 3.2.4)
114+
nanaimo (~> 0.4.0)
115+
rexml (>= 3.3.6, < 4.0)
100116

101117
PLATFORMS
102-
arm64-darwin-23
118+
aarch64-linux-gnu
119+
aarch64-linux-musl
120+
arm-linux-gnu
121+
arm-linux-musl
122+
arm64-darwin
123+
ruby
124+
x86-linux-gnu
125+
x86-linux-musl
126+
x86_64-darwin
127+
x86_64-linux-gnu
128+
x86_64-linux-musl
103129

104130
DEPENDENCIES
105131
cocoapods (= 1.14.3)
106132

107133
BUNDLED WITH
108-
2.4.10
134+
2.5.23

‎Makefile‎

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TVOS_SIMULATOR_ARCHIVE_DSYM_PATH = $(CURR_DIR)/build/tvos_simulator.xcarchive/dS
1414
TVOS_ARCHIVE_PATH = $(CURR_DIR)/build/tvos.xcarchive/Products/Library/Frameworks/
1515
TVOS_ARCHIVE_DSYM_PATH = $(CURR_DIR)/build/tvos.xcarchive/dSYMs/
1616

17-
# Values with defaults
17+
# CI variables - using values with defaults. Set defaults to values that are most useful for local development.
1818
IOS_DEVICE_NAME ?= iPhone 15
1919
# If OS version is not specified, uses the first device name match in the list of available simulators
2020
IOS_VERSION ?=
@@ -33,29 +33,6 @@ else
3333
TVOS_DESTINATION = "platform=tvOS Simulator,name=$(TVOS_DEVICE_NAME),OS=$(TVOS_VERSION)"
3434
endif
3535

36-
clean-derived-data:
37-
@if [ -z "$(SCHEME)" ]; then \
38-
echo "Error: SCHEME variable is not set."; \
39-
exit 1; \
40-
fi; \
41-
if [ -z "$(DESTINATION)" ]; then \
42-
echo "Error: DESTINATION variable is not set."; \
43-
exit 1; \
44-
fi; \
45-
echo "Cleaning derived data for scheme: $(SCHEME) with destination: $(DESTINATION)"; \
46-
DERIVED_DATA_PATH=`xcodebuild -workspace $(PROJECT_NAME).xcworkspace -scheme "$(SCHEME)" -destination "$(DESTINATION)" -showBuildSettings | grep -m1 'BUILD_DIR' | awk '{print $$3}' | sed 's|/Build/Products||'`; \
47-
echo "DerivedData Path: $$DERIVED_DATA_PATH"; \
48-
\
49-
LOGS_TEST_DIR=$$DERIVED_DATA_PATH/Logs/Test; \
50-
echo "Logs Test Path: $$LOGS_TEST_DIR"; \
51-
\
52-
if [ -d "$$LOGS_TEST_DIR" ]; then \
53-
echo "Removing existing .xcresult files in $$LOGS_TEST_DIR"; \
54-
rm -rf "$$LOGS_TEST_DIR"/*.xcresult; \
55-
else \
56-
echo "Logs/Test directory does not exist. Skipping cleanup."; \
57-
fi;
58-
5936
setup-tools: install-githook
6037

6138
setup:
@@ -102,15 +79,15 @@ build-ios:
10279
@echo "######################################################################"
10380
@echo "### Building iOS archive"
10481
@echo "######################################################################"
105-
xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/ios.xcarchive" -sdk iphoneos -destination="iOS" SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES ADB_SKIP_LINT=YES
106-
xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/ios_simulator.xcarchive" -sdk iphonesimulator -destination="iOS Simulator" SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES ADB_SKIP_LINT=YES
82+
xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/ios.xcarchive" -sdk iphoneos -destination="iOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ADB_SKIP_LINT=YES
83+
xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/ios_simulator.xcarchive" -sdk iphonesimulator -destination="iOS Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ADB_SKIP_LINT=YES
10784

10885
build-tvos:
10986
@echo "######################################################################"
11087
@echo "### Building tvOS archive"
11188
@echo "######################################################################"
112-
xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/tvos.xcarchive" -sdk appletvos -destination="tvOS" SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES ADB_SKIP_LINT=YES
113-
xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/tvos_simulator.xcarchive" -sdk appletvsimulator -destination="tvOS Simulator" SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES ADB_SKIP_LINT=YES
89+
xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/tvos.xcarchive" -sdk appletvos -destination="tvOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ADB_SKIP_LINT=YES
90+
xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/tvos_simulator.xcarchive" -sdk appletvsimulator -destination="tvOS Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ADB_SKIP_LINT=YES
11491

11592
zip:
11693
cd build && zip -r -X $(PROJECT_NAME).xcframework.zip $(PROJECT_NAME).xcframework/
@@ -133,30 +110,31 @@ unit-test-ios:
133110
@echo "######################################################################"
134111
@echo "### Unit Testing iOS"
135112
@echo "######################################################################"
136-
@$(MAKE) clean-derived-data SCHEME=UnitTests DESTINATION=$(IOS_DESTINATION)
137-
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "UnitTests" -destination $(IOS_DESTINATION) -enableCodeCoverage YES ADB_SKIP_LINT=YES
113+
rm -rf build/reports/iosUnitResults.xcresult
114+
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "UnitTests" -destination $(IOS_DESTINATION) -derivedDataPath build/out -resultBundlePath build/reports/iosUnitResults.xcresult -enableCodeCoverage YES ADB_SKIP_LINT=YES
138115

139116
functional-test-ios:
140117
@echo "######################################################################"
141118
@echo "### Functional Testing iOS"
142119
@echo "######################################################################"
143-
@$(MAKE) clean-derived-data SCHEME=FunctionalTests DESTINATION=$(IOS_DESTINATION)
144-
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "FunctionalTests" -destination $(IOS_DESTINATION) -enableCodeCoverage YES ADB_SKIP_LINT=YES
120+
rm -rf build/reports/iosFunctionalResults.xcresult
121+
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "FunctionalTests" -destination $(IOS_DESTINATION) -derivedDataPath build/out -resultBundlePath build/reports/iosFunctionalResults.xcresult -enableCodeCoverage YES ADB_SKIP_LINT=YES
145122

146123
unit-test-tvos:
147124
@echo "######################################################################"
148125
@echo "### Unit Testing tvOS"
149126
@echo "######################################################################"
150-
@$(MAKE) clean-derived-data SCHEME=UnitTests DESTINATION=$(TVOS_DESTINATION)
151-
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "UnitTests" -destination $(TVOS_DESTINATION) -enableCodeCoverage YES ADB_SKIP_LINT=YES
127+
rm -rf build/reports/tvosUnitResults.xcresult
128+
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "UnitTests" -destination $(TVOS_DESTINATION) -derivedDataPath build/out -resultBundlePath build/reports/tvosUnitResults.xcresult -enableCodeCoverage YES ADB_SKIP_LINT=YES
152129

153130
functional-test-tvos:
154131
@echo "######################################################################"
155132
@echo "### Functional Testing tvOS"
156133
@echo "######################################################################"
157-
@$(MAKE) clean-derived-data SCHEME=FunctionalTests DESTINATION=$(TVOS_DESTINATION)
158-
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "FunctionalTests" -destination $(TVOS_DESTINATION) -enableCodeCoverage YES ADB_SKIP_LINT=YES
134+
rm -rf build/reports/tvosFunctionalResults.xcresult
135+
xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme "FunctionalTests" -destination $(TVOS_DESTINATION) -derivedDataPath build/out -resultBundlePath build/reports/tvosFunctionalResults.xcresult -enableCodeCoverage YES ADB_SKIP_LINT=YES
159136

137+
# CI alias for build and test workflow
160138
integration-test-ios: upstream-integration-test-ios
161139

162140
# Runs the Edge Network (Konductor) integration tests after installing pod dependencies
@@ -165,7 +143,6 @@ integration-test-ios: upstream-integration-test-ios
165143
# If MOBILE_PROPERTY_ID is not specified, test target will use its default value.
166144
.SILENT: upstream-integration-test-ios # Silences Makefile's automatic echo of commands
167145
upstream-integration-test-ios: pod-install; \
168-
$(MAKE) clean-derived-data SCHEME=UpstreamIntegrationTests DESTINATION=$(IOS_DESTINATION)
169146
if [ -z "$$EDGE_ENVIRONMENT" ]; then \
170147
echo ''; \
171148
echo '-------------------------- WARNING -------------------------------'; \
@@ -177,6 +154,8 @@ upstream-integration-test-ios: pod-install; \
177154
-workspace $(PROJECT_NAME).xcworkspace \
178155
-scheme UpstreamIntegrationTests \
179156
-destination $(IOS_DESTINATION) \
157+
-derivedDataPath build/out \
158+
-resultBundlePath build/reports/iosIntegrationUpstreamResults.xcresult \
180159
-enableCodeCoverage YES \
181160
ADB_SKIP_LINT=YES \
182161
TAGS_MOBILE_PROPERTY_ID=$(TAGS_MOBILE_PROPERTY_ID) \

0 commit comments

Comments
 (0)