Skip to content
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.

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

chore: refine workflows #477

Merged
merged 2 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
name: Build and Test

on:
repository_dispatch:
types: [build]
pull_request:
branches: ['*']
push:
branches:
- main
workflow_call:

concurrency:
Expand Down Expand Up @@ -101,7 +102,7 @@ jobs:
run: |
xcodebuild -workspace samples/SwiftDemoApp/SwiftDemoApp.xcworkspace \
-scheme SwiftDemoApp -configuration Debug \
-destination "platform=iOS Simulator,OS=17.5,name=iPhone 15" build | xcpretty
-destination "platform=iOS Simulator,OS=17.4,name=iPhone 15" build | xcpretty

build_objc_sample:
name: Build Objective-C Sample App with CocoaPods locally
Expand All @@ -110,7 +111,7 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout google-maps-ios-utils
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Dependencies
run: sudo gem install cocoapods
Expand All @@ -122,7 +123,7 @@ jobs:
run: |
xcodebuild -workspace samples/ObjCDemoApp/ObjCDemoApp.xcworkspace \
-scheme ObjCDemoApp -configuration Debug \
-destination "platform=iOS Simulator,OS=17.5,name=iPhone 15" build | xcpretty
-destination "platform=iOS Simulator,OS=17.4,name=iPhone 15" build | xcpretty

test: # used as required status check
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
# Note the "if" statement on all commands to make sure that publishing
# only happens when a release is cut.

- if: ${{ steps.release.outputs.release_created }}
name: Checkout
uses: actions/checkout@v4

- if: ${{ steps.release.outputs.release_created }}
name: Start publish
uses: ./.github/workflows/publish.yml
2 changes: 2 additions & 0 deletions Google-Maps-iOS-Utils.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Pod::Spec.new do |s|
dependent on it.
"
s.homepage = "https://github.com/googlemaps/google-maps-ios-utils"
s.readme = "https://github.com/googlemaps/google-maps-ios-utils/blob/main/README.md"
s.changelog = "https://github.com/googlemaps/google-maps-ios-utils/blob/main/CHANGELOG.md"
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
s.authors = "Google Inc."
s.platform = :ios, '14.0'
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,16 @@ range of applications using the [Google Maps SDK for iOS][sdk].

1. In your `Podfile`:

<!-- x-release-please-start-version -->
```ruby
use_frameworks!

target 'TARGET_NAME' do
pod 'GoogleMaps', '8.0.0'
pod 'Google-Maps-iOS-Utils', '5.0.0'
pod 'Google-Maps-iOS-Utils', '5.0.0' # x-release-please-start-version
end
```
<!-- x-release-please-end -->

(You can omit the comment "x-release-please-start-version" which is used for release automation.)
Replace `TARGET_NAME` and save the `Podfile`.

2. At the command line in directory containing your `Podfile`, run:
Expand Down