Skip to content

Commit fc90040

Browse files
authored
chore: Update v1 branch to start release on v1 branch (#2476)
1 parent 88d5a6b commit fc90040

File tree

1 file changed

+12
-30
lines changed

1 file changed

+12
-30
lines changed

.circleci/config.yml

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ orbs:
107107
defaults: &defaults
108108
macos:
109109
xcode: '13.3.0'
110-
working_directory: ~/amplify-ios
110+
working_directory: ~/amplify-swift
111111
environment:
112112
BUNDLE_PATH: vendor/bundle
113113

@@ -121,7 +121,7 @@ references:
121121
- v2-repo-{{ .Branch }}
122122
- v2-repo
123123

124-
pods_cache_key: &pods_cache_key v3-dependency-pods-{{ checksum "~/amplify-ios/Podfile" }}
124+
pods_cache_key: &pods_cache_key v3-dependency-pods-{{ checksum "~/amplify-swift/Podfile" }}
125125

126126
pods_backup_cache_key: &pods_backup_cache_key v3-dependency-pods
127127

@@ -140,13 +140,13 @@ commands:
140140
steps:
141141
- run:
142142
name: Pre-start simulator
143-
command: bash ~/amplify-ios/CircleciScripts/pre_start_simulator.sh
143+
command: bash ~/amplify-swift/CircleciScripts/pre_start_simulator.sh
144144

145145
restore_gems:
146146
steps:
147147
- restore_cache:
148148
keys:
149-
- v2-gems-{{ checksum "~/amplify-ios/Gemfile.lock" }}
149+
- v2-gems-{{ checksum "~/amplify-swift/Gemfile.lock" }}
150150
- v2-gems-
151151

152152
check_bundle:
@@ -196,7 +196,7 @@ jobs:
196196
- save_cache:
197197
key: *repo_cache_key
198198
paths:
199-
- ~/amplify-ios
199+
- ~/amplify-swift
200200

201201
install_gems:
202202
<<: *defaults
@@ -210,7 +210,7 @@ jobs:
210210
BUNDLE_JOBS: 4
211211
BUNDLE_RETRY: 3
212212
- save_cache:
213-
key: v2-gems-{{ checksum "~/amplify-ios/Gemfile.lock" }}
213+
key: v2-gems-{{ checksum "~/amplify-swift/Gemfile.lock" }}
214214
paths:
215215
- vendor/bundle
216216

@@ -231,14 +231,14 @@ jobs:
231231
command: xcodebuild test -workspace Amplify.xcworkspace -scheme Amplify -sdk iphonesimulator -destination "${destination}" | tee "artifacts/test-Amplify.log" | xcpretty --simple --color --report junit
232232
- run:
233233
name: Upload coverage report to Codecov
234-
command: bash ~/amplify-ios/build-support/codecov.sh -F 'Amplify' -J '^Amplify$'
234+
command: bash ~/amplify-swift/build-support/codecov.sh -F 'Amplify' -J '^Amplify$'
235235
- store_test_results:
236236
path: build/reports
237237
- upload_artifacts
238238

239239
build_amplify_spm:
240240
<<: *defaults
241-
working_directory: ~/amplify-ios/.swiftpm/xcode
241+
working_directory: ~/amplify-swift/.swiftpm/xcode
242242
steps:
243243
- *restore_repo
244244
- pre_start_simulator
@@ -266,7 +266,7 @@ jobs:
266266
command: xcodebuild test -workspace Amplify.xcworkspace -scheme AWSPluginsCore -sdk iphonesimulator -destination "${destination}" | tee "artifacts/test-AWSPluginsCore.log" | xcpretty --simple --color --report junit
267267
- run:
268268
name: Upload coverage report to Codecov
269-
command: bash ~/amplify-ios/build-support/codecov.sh -F 'AWSPluginsCore' -J '^AWSPluginsCore$'
269+
command: bash ~/amplify-swift/build-support/codecov.sh -F 'AWSPluginsCore' -J '^AWSPluginsCore$'
270270
- store_test_results:
271271
path: build/reports
272272
- upload_artifacts
@@ -280,7 +280,7 @@ jobs:
280280
type: string
281281
scheme:
282282
type: string
283-
working_directory: ~/amplify-ios/AmplifyPlugins/<< parameters.path >>
283+
working_directory: ~/amplify-swift/AmplifyPlugins/<< parameters.path >>
284284
description: << parameters.path >> unit test
285285
steps:
286286
- *restore_repo
@@ -301,21 +301,11 @@ jobs:
301301
command: xcodebuild test -workspace << parameters.workspace >>.xcworkspace -scheme << parameters.scheme >> -sdk iphonesimulator -destination "${destination}" | tee "artifacts/test-<< parameters.scheme >>.log" | xcpretty --simple --color --report junit
302302
- run:
303303
name: Upload << parameters.path >> coverage report to Codecov
304-
command: bash ~/amplify-ios/build-support/codecov.sh -F << parameters.path >>_plugin_unit_test -J '^<< parameters.scheme >>$'
304+
command: bash ~/amplify-swift/build-support/codecov.sh -F << parameters.path >>_plugin_unit_test -J '^<< parameters.scheme >>$'
305305
- store_test_results:
306306
path: build/reports
307307
- upload_artifacts
308308

309-
generate_api_docs:
310-
<<: *defaults
311-
steps:
312-
- *restore_repo
313-
- restore_gems
314-
- check_bundle
315-
- run:
316-
name: Jazzy API doc generation
317-
command: bash ~/amplify-ios/CircleciScripts/jazzy_doc_gen.sh
318-
319309
deploy:
320310
<<: *defaults
321311
parameters:
@@ -430,7 +420,7 @@ workflows:
430420
filters:
431421
branches:
432422
only:
433-
- main
423+
- v1
434424
- deploy:
435425
name: deploy stable
436426
lane: release
@@ -439,14 +429,6 @@ workflows:
439429
branches:
440430
only:
441431
- release-v1
442-
- generate_api_docs:
443-
name: Generate api documentation
444-
requires:
445-
- deploy stable
446-
filters:
447-
branches:
448-
only:
449-
- release-v1
450432

451433
# Scheduled smoke test workflow
452434
# Jobs are pulled from the getting-started-smoke-test inline orb defined below

0 commit comments

Comments
 (0)