Skip to content

Commit 158ccd0

Browse files
authored
cherry-pick recent release process changes to release branch (#6775)
* CocoaPods CI update (#6751) * Finish port of update-versions.py (#6758) * Some Release tooling cleanup (#6761) * Rename ReleaseTooling (#6772) * Address two comments from last week's PRs (#6774) * Source updates for ReleaseTooling rename (#6773)
1 parent c5ea958 commit 158ccd0

File tree

129 files changed

+75
-1065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+75
-1065
lines changed

.github/workflows/zip.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: zip
33
on:
44
pull_request:
55
paths:
6-
- 'ZipBuilder/**'
6+
- 'ReleaseTooling/**'
77
- '.github/workflows/zip.yml'
88
# Don't run based on any markdown only changes.
9-
- '!ZipBuilder/*.md'
9+
- '!ReleaseTooling/*.md'
1010
schedule:
1111
# Run every day at midnight(PST) - cron uses UTC times
1212
- cron: '0 8 * * *'
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v2
2121
- name: Build
2222
run: |
23-
cd ZipBuilder
23+
cd ReleaseTooling
2424
swift build -v
2525
2626
package:

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ DerivedData
5757

5858
# Swift Package Manager
5959
*/.build
60-
ZipBuilder/Packages
61-
ZipBuilder/*.xcodeproj
62-
ZipBuilder/Package.resolved
60+
ReleaseTooling/Packages
61+
ReleaseTooling/*.xcodeproj
62+
ReleaseTooling/Package.resolved
6363

6464
# Mint package manager
6565
Mint

.travis.yml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -239,54 +239,24 @@ jobs:
239239

240240
# Validate Cocoapods configurations
241241
# This may take long time, so we would like to run it only once all other tests pass
242-
# Validate Cocoapods 1.7.0 compatibility
243242
- stage: test
244243
if: type = cron
245244
env:
246-
- POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_frameworks
245+
- POD_CONFIG_DIR=Cocoapods_multiprojects_frameworks
247246
script:
248247
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
249248

250249
- stage: test
251250
if: type = cron
252251
env:
253-
- POD_CONFIG_DIR=Cocoapods1_7_0_frameworks
254-
script:
255-
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
256-
257-
- stage: test
258-
if: type = cron
259-
env:
260-
- POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_staticLibs
261-
script:
262-
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
263-
264-
- stage: test
265-
if: type = cron
266-
env:
267-
- POD_CONFIG_DIR=Cocoapods1_7_0_staticLibs
268-
script:
269-
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
270-
271-
# Validate Cocoapods 1.6.1 compatibility
272-
- stage: test
273-
if: type = cron
274-
env:
275-
- POD_CONFIG_DIR=Cocoapods1_6_1_frameworks
276-
script:
277-
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
278-
279-
- stage: test
280-
if: type = cron
281-
env:
282-
- POD_CONFIG_DIR=Cocoapods1_6_1_staticLibs
252+
- POD_CONFIG_DIR=Cocoapods_multiprojects_staticLibs
283253
script:
284254
- travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile
285255

286256
allow_failures:
287257
# Run fuzz tests only on cron jobs.
288258
- stage: test
289-
if: type = cron
259+
# if: type = cron
290260
env:
291261
- PROJECT=Firestore PLATFORM=iOS METHOD=fuzz
292262
before_install:

AddNewPod.md

Lines changed: 2 additions & 1 deletion

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile

Lines changed: 0 additions & 24 deletions
This file was deleted.

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Gemfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile

Lines changed: 0 additions & 22 deletions
This file was deleted.

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Gemfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile

Lines changed: 0 additions & 23 deletions
This file was deleted.

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Gemfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)