Skip to content

Commit 0ebfd30

Browse files
authored
chore: merge dev into main
2 parents 542e1f5 + dc1f75f commit 0ebfd30

File tree

3 files changed

+8
-24
lines changed

3 files changed

+8
-24
lines changed
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: Deploy docs to GH pages
22

33
on:
4-
release:
5-
types: [published]
4+
push:
5+
branches: [main]
66
workflow_dispatch:
77

88
permissions:
@@ -16,7 +16,6 @@ concurrency:
1616

1717
jobs:
1818
deploy:
19-
if: github.event_name == 'workflow_dispatch' || startsWith(github.event.release.target_commitish, 'main')
2019
environment:
2120
name: github-pages
2221
url: ${{ steps.deployment.outputs.page_url }}
@@ -28,7 +27,9 @@ jobs:
2827
fetch-depth: 0
2928
- name: Setup
3029
uses: ./.github/actions/setup
31-
- name: Build
30+
- name: Generate nitrogen code
31+
run: yarn nitrogen
32+
- name: Build docs
3233
run: yarn docs
3334
- name: Setup Pages
3435
uses: actions/[email protected]

.github/workflows/prepare_dev_for_next_release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: Prepare dev branch for next release
33
on:
44
push:
55
branches: [main]
6-
paths:
7-
- 'package.json'
86

97
permissions:
108
contents: write
@@ -13,7 +11,7 @@ jobs:
1311
update-pods:
1412
name: Update Podfile.lock after release
1513
runs-on: macos-latest
16-
if: startsWith(github.event.head_commit.message, 'release:')
14+
if: contains(join(github.event.commits.*.message, ' '), 'release')
1715
env:
1816
XCODE_VERSION: latest-stable
1917

@@ -50,7 +48,7 @@ jobs:
5048
name: Merge main into dev
5149
runs-on: ubuntu-latest
5250
needs: update-pods
53-
if: startsWith(github.event.head_commit.message, 'release:')
51+
if: contains(join(github.event.commits.*.message, ' '), 'release')
5452
steps:
5553
- name: Checkout
5654
uses: actions/[email protected]

README.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,7 @@ React Native wrapper for Android & iOS Google Maps SDK.
1010

1111
## Documentation
1212

13-
Full installation guide and API reference:
14-
https://pinpong.github.io/react-native-google-maps-plus
15-
16-
## Contributing
17-
18-
- [Development workflow](CONTRIBUTING.md#development-workflow)
19-
- [Sending a pull request](CONTRIBUTING.md#sending-a-pull-request)
20-
- [Code of conduct](CODE_OF_CONDUCT.md)
21-
22-
## License
23-
24-
MIT
25-
26-
---
27-
28-
Made with [create-react-native-library](https://github.com/callstack/react-native-builder-bob)
13+
- [Installation guide and API reference](https://pinpong.github.io/react-native-google-maps-plus)
2914

3015
## Contributing
3116

0 commit comments

Comments
 (0)