Skip to content

Commit d95bc3d

Browse files
ci: Remove pull_request_target references (#237)
1 parent f0af41a commit d95bc3d

File tree

3 files changed

+36
-26
lines changed

3 files changed

+36
-26
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "Dependabot Automerge"
2+
3+
on:
4+
workflow_run:
5+
workflows:
6+
- "Pull Request Checks"
7+
types:
8+
- completed
9+
10+
jobs:
11+
automerge-dependabot:
12+
name: "Automerge Dependabot PR"
13+
uses: mParticle/mparticle-workflows/.github/workflows/dependabot-automerge.yml@main

.github/workflows/higgs-shop-sample-app-pull-request.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
name: Higgs Shop Sample App Pull Request
22

33
on:
4-
pull_request:
5-
4+
workflow_call:
5+
inputs:
6+
app_relative_path:
7+
description: 'repo path for sample app'
8+
required: true
9+
type: string
10+
611
defaults:
712
run:
8-
working-directory: core-sdk-samples/higgs-shop-sample-app
13+
working-directory: ${{ inputs.app_relative_path }}
914

1015
jobs:
1116
build-and-test:

.github/workflows/pull-request.yml

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "Pull Request Checks"
22

3-
on: [ pull_request_target ]
3+
on: [ push, workflow_dispatch, pull_request ]
44

55
jobs:
66

@@ -11,29 +11,21 @@ jobs:
1111
app_relative_path: "core-sdk-samples/higgs-shop-sample-app"
1212

1313
automerge-dependabot:
14-
name: "Automerge Dependabot PR"
14+
name: "Save PR Number for Dependabot Automerge"
1515
needs: [ higgs-shop-sample-app ]
16-
if: ${{ github.actor == 'dependabot[bot]' }}
17-
env:
18-
GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
19-
GIT_AUTHOR_NAME: mparticle-bot
20-
GIT_AUTHOR_EMAIL: [email protected]
21-
GIT_COMMITTER_NAME: mparticle-bot
22-
GIT_COMMITTER_EMAIL: [email protected]
16+
if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' }}
2317
runs-on: ubuntu-latest
2418
steps:
25-
- name: "Rebase Dependabot PR"
26-
uses: actions/github-script@v3
19+
- name: "Checkout PR branch"
20+
uses: actions/checkout@v2
2721
with:
28-
script: |
29-
github.pulls.merge({
30-
owner: context.repo.owner,
31-
repo: context.payload.repository.name,
32-
pull_number: context.payload.pull_request.number,
33-
merge_method: 'rebase'
34-
});
35-
rebase-development:
36-
name: "Rebase Development onto Dependabot Branch"
37-
needs: [ automerge-dependabot ]
38-
if: ${{ github.actor == 'dependabot[bot]' }}
39-
uses: mParticle/mparticle-workflows/.github/workflows/dependabot-rebase-development.yml@stable
22+
submodules: recursive
23+
fetch-depth: 0
24+
- name: "Save Pull Request Number"
25+
run: |
26+
mkdir -p ./pr
27+
echo ${{ github.event.number }} > ./pr/NR
28+
- uses: actions/upload-artifact@v2
29+
with:
30+
name: pr
31+
path: pr/

0 commit comments

Comments
 (0)