Skip to content

Commit e74b9d8

Browse files
authored
Merge pull request #143 from rees46/fix/workflow-branch
fix(github): workflow branch
2 parents b5e4ba7 + df59843 commit e74b9d8

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- master
99
paths-ignore:
10-
- '.github/**'
10+
- ".github/**"
1111
workflow_dispatch:
1212

1313
jobs:

.github/workflows/sync.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
name: Sync repositories
22

33
on:
4-
workflow_run:
5-
workflows:
6-
- "Bump version, create release and publish"
4+
pull_request:
75
types:
8-
- completed
6+
- closed
7+
branches:
8+
- master
99
workflow_dispatch:
1010

1111
jobs:
1212
run:
13-
if: github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch'
14-
uses: rees46/workflow/.github/workflows/reusable-ios-synchronization.yaml@refactor/reusable-ios-synchronization
13+
if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
14+
uses: rees46/workflow/.github/workflows/reusable-ios-synchronization.yaml@master
1515
permissions: write-all
1616
secrets:
1717
privateKey: ${{ secrets.PERSONACLICK_COURIER_SECRET }}

REES46.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
3232

3333
s.screenshots = ['https://rees46.com/static-images/cocoapods/r46_ios_sdk_cocoapods_cover.png']
3434

35-
s.source = { :git => "https://github.com/rees46/ios-sdk.git", :branch => ENV['GITHUB_HEAD_REF'] || 'master' }
35+
s.source = { :git => "https://github.com/rees46/ios-sdk.git", :branch => "master" }
3636

3737
s.ios.deployment_target = '12.0'
3838

0 commit comments

Comments
 (0)