Skip to content

Run unit tests from pod lib lint #7872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulb777 merged 4 commits into from
Apr 9, 2021
Merged

Run unit tests from pod lib lint #7872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01858bd
Run unit tests from pod lib lint
paulb777 Apr 8, 2021
4036ca1
yml fix
paulb777 Apr 8, 2021
5da3835
Different options for Swift pod
paulb777 Apr 8, 2021
1be63e0
Recomment cron jobs after success
paulb777 Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions .github/workflows/storage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,17 @@ jobs:
# watchos is disabled since pod lib lint cannot handle test Auth dep even if the dep is only
# specified for the other three platforms.
target: [ios, tvos, macos]
spec: [
'FirebaseStorage.podspec --test-specs=unit', # The integration tests need more set up.
'FirebaseStorageSwift.podspec --skip-tests' # No current unit tests.
]
steps:
- uses: actions/checkout@v2
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: Build and test
run: |
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --skip-tests --platforms=${{ matrix.target }}
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorageSwift.podspec --skip-tests --platforms=${{ matrix.target }}
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.spec }} --platforms=${{ matrix.target }}

storage-cron-only:
# Don't run on private repo.
Expand All @@ -134,8 +137,8 @@ jobs:
matrix:
target: [ios, tvos, macos]
flags: [
'--skip-tests --use-static-frameworks',
'--skip-tests --use-libraries'
'--use-static-frameworks --skip-tests ',
'--use-libraries --skip-tests '
]
needs: pod-lib-lint
steps:
Expand All @@ -145,4 +148,22 @@ jobs:
- name: PodLibLint Storage Cron
run: |
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

storageswift-cron-only:
# Don't run on private repo.
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
runs-on: macos-latest
strategy:
matrix:
target: [ios, tvos, macos]
flags: [
'--use-static-frameworks --skip-tests', # Swift pods do not support --use-libraries
]
needs: pod-lib-lint
steps:
- uses: actions/checkout@v2
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: PodLibLint Storage Cron
run: |
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorageSwift.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
26 changes: 0 additions & 26 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,14 +496,6 @@ case "$product-$platform-$method" in

Storage-*-xcodebuild)
pod_gen FirebaseStorage.podspec --platforms=ios
RunXcodebuild \
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
-scheme "FirebaseStorage-Unit-unit" \
"${ios_flags[@]}" \
"${xcb_flags[@]}" \
build \
test

if check_secrets; then
# Integration tests are only run on iOS to minimize flake failures.
RunXcodebuild \
Expand All @@ -522,24 +514,6 @@ case "$product-$platform-$method" in
build \
test
fi

pod_gen FirebaseStorage.podspec --platforms=macos --clean
RunXcodebuild \
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
-scheme "FirebaseStorage-Unit-unit" \
"${macos_flags[@]}" \
"${xcb_flags[@]}" \
build \
test

pod_gen FirebaseStorage.podspec --platforms=tvos --clean
Comment on lines -526 to -535
Copy link
Copy Markdown
Member

@ncooke3 ncooke3 Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just so I understand better, why are we removing these from the build script? Are your changes to the pod-lib-lint task in storage.yml effectively replacing these parts of the build script?

Copy link
Copy Markdown
Member Author

@paulb777 paulb777 Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The unit tests now get run from pod lib lint. It's just recently possible because CocoaPods 1.10 introduced the feature of being able to select test_spec's to run instead of the all or none that it was previously.

RunXcodebuild \
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
-scheme "FirebaseStorage-Unit-unit" \
"${tvos_flags[@]}" \
"${xcb_flags[@]}" \
build \
test
;;

StorageSwift-*-xcodebuild)
Expand Down