Skip to content

Commit 88d5a6b

Browse files
authored
chore: Update the configuration to point to v1 and release (#2468)
1 parent 1c82ba4 commit 88d5a6b

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,15 +438,15 @@ workflows:
438438
filters:
439439
branches:
440440
only:
441-
- release
441+
- release-v1
442442
- generate_api_docs:
443443
name: Generate api documentation
444444
requires:
445445
- deploy stable
446446
filters:
447447
branches:
448448
only:
449-
- release
449+
- release-v1
450450

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

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
push:
55
branches:
66
- main
7-
- dev-preview
7+
- v1
88
pull_request:
99
# The branches below must be a subset of the branches above
1010
branches:
1111
- main
12-
- dev-preview
12+
- v1
1313
schedule:
1414
# ┌───────────── minute (0 - 59)
1515
# │ ┌───────────── hour (0 - 23)

.github/workflows/integ_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Integration Tests
22
on:
33
push:
4-
branches: [main]
4+
branches: [v1]
55

66
permissions:
77
id-token: write
@@ -38,7 +38,7 @@ jobs:
3838
persist-credentials: false
3939

4040
- name: Make directory
41-
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
41+
run: mkdir -p ~/.aws-amplify/amplify-swift/testconfiguration/
4242

4343
- name: Copy integration test resouces
4444
uses: ./.github/composite_actions/download_test_configuration
@@ -66,7 +66,7 @@ jobs:
6666
persist-credentials: false
6767

6868
- name: Make directory
69-
run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
69+
run: mkdir -p ~/.aws-amplify/amplify-swift/testconfiguration/
7070

7171
- name: Copy integration test resouces
7272
uses: ./.github/composite_actions/download_test_configuration

.github/workflows/release_block_manual_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
#
66
# https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
77

8-
name: Block Manual PR to Release
8+
name: Block Manual PR to Release V1+
99

1010
on:
1111
pull_request:
1212
branches:
13-
- release
13+
- release-v1
1414

1515
permissions:
1616
pull-requests: write

.github/workflows/release_kickoff.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Creates a PR to push main to release branch to kick-off the CircleCI release workflow
2-
name: Release Amplify iOS
2+
name: Release Amplify iOS V1+
33

44
on:
55
workflow_dispatch:
@@ -18,4 +18,4 @@ jobs:
1818
- name: Create PR to push main to release branch
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21-
run: "gh pr create --title 'chore: kickoff release' --body 'kickoff release' --head main --base release"
21+
run: "gh pr create --title 'chore: kickoff v1 release' --body 'kickoff v1 release' --head v1 --base release-v1"

.github/workflows/release_merge_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Validates and merges release PRs after they have been approved.
2-
name: Merge Release PR
2+
name: Merge V1 Release PR
33

44
on:
55
pull_request_review:
@@ -14,7 +14,7 @@ jobs:
1414
check:
1515
name: Validate and Merge PR
1616
runs-on: ubuntu-latest
17-
if: "${{ github.event.pull_request.base.ref == 'release' && github.event.pull_request.head.ref == 'main' && github.event.pull_request.title == 'chore: kickoff release' && github.event.review.state == 'approved' }}"
17+
if: "${{ github.event.pull_request.base.ref == 'release-v1' && github.event.pull_request.head.ref == 'v1' && github.event.pull_request.title == 'chore: kickoff v1 release' && github.event.review.state == 'approved' }}"
1818

1919
steps:
2020
- name: Merge PR

.jazzy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module: Amplify
22
author: Amazon Web Services
3-
github_url: https://github.com/aws-amplify/amplify-ios
3+
github_url: https://github.com/aws-amplify/amplify-swift
44

55
exclude:
66
- Pods

Amplify.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Pod::Spec.new do |s|
1717

1818
s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services'
1919

20-
s.homepage = 'https://github.com/aws-amplify/amplify-ios'
20+
s.homepage = 'https://github.com/aws-amplify/amplify-swift'
2121
s.license = 'Apache License, Version 2.0'
2222
s.author = { 'Amazon Web Services' => 'amazonwebservices' }
23-
s.source = { :git => 'https://github.com/aws-amplify/amplify-ios.git', :tag => $AMPLIFY_RELEASE_TAG }
23+
s.source = { :git => 'https://github.com/aws-amplify/amplify-swift.git', :tag => $AMPLIFY_RELEASE_TAG }
2424

2525
s.platform = :ios, '11.0'
2626
s.swift_version = '5.0'
@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
3131
# There appears to be a bug in Xcode < 12 where SwiftUI isn't properly
3232
# weak-linked even though system frameworks should be weak-linked by default.
3333
# Explicitly weak link it here until we upgrade Amplify's platform support
34-
# version to >= 13.0. https://github.com/aws-amplify/amplify-ios/issues/878
34+
# version to >= 13.0. https://github.com/aws-amplify/amplify-swift/issues/878
3535
s.weak_frameworks = 'SwiftUI'
3636

3737
s.subspec 'Default' do |default|

fastlane/Fastfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ platform :ios do
8585
sh('git', 'commit', '-am', commit_message)
8686

8787
# push to origin
88-
sh('git', 'push', 'origin', 'release')
88+
sh('git', 'push', 'origin', 'release-v1')
8989
end
9090

9191
desc "Tag in git and push to GitHub"
@@ -149,8 +149,8 @@ platform :ios do
149149
push_git_tags(tag: tag, force: true)
150150

151151
# push to origin
152-
sh('git', 'push', 'origin', 'release')
153-
sh('git', 'push', 'origin', 'release:main')
152+
sh('git', 'push', 'origin', 'release-v1')
153+
sh('git', 'push', 'origin', 'release-v1:v1')
154154
end
155155
end
156156

0 commit comments

Comments
 (0)