Skip to content

Commit

Permalink
Merge pull request jc01rho-openpilot-BoltEV2019-KoKr#62 from jc01rho-…
Browse files Browse the repository at this point in the history
…openpilot-BoltEV2019-KoKr/hkg_dev

fixed actions
  • Loading branch information
jc01rho authored May 5, 2022
2 parents 2e560b1 + 374d9ee commit b2aa419
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/hkg_dev_updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ jobs:
# The type of runner that the job will run on
runs-on: ubuntu-20.04
if: github.repository == 'jc01rho-openpilot-BoltEV2019-KoKr/boltpilot'
outputs:
has_new_commits: ${{ steps.sync.outputs.has_new_commits }}
# Steps represent a sequence of tasks that will be executed as part of the job
steps:

- uses: actions/checkout@v3 #checkout origin
with:
fetch-depth: 0
Expand All @@ -35,8 +36,8 @@ jobs:
target_repo_token: ${{ secrets.GITHUB_TOKEN }}
upstream_sync_branch: hkg_dev
upstream_sync_repo: neokii/npilot

- name: New commits found
# if: steps.sync.outputs.has_new_commits == 'true'
uses: ./.github/workflows/pr-from-hkg-dev
make_pr_call:
needs: pull_from_neokii # ${{needs.job1.outputs.output1}}
if: needs.pull_from_neokii.outputs.has_new_commits == 'true'
uses: ./.github/workflows/pr-from-hkg-dev.yml

7 changes: 2 additions & 5 deletions .github/workflows/pr-from-hkg-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,10 @@ jobs:
destination_branch: "feature/0814"
github_token: ${{ secrets.GITHUB_TOKEN }}
pr_reviewer: "jc01rho" # Comma-separated list (no spaces)
pr_assignee: "jc01rho"
# pr_assignee: "jc01rho"
pr_label: "automerge"

- uses: peter-evans/enable-pull-request-automerge@v2
with:
token: ${{ secrets.PAT }}
pull-request-number: ${{steps.open-pr.outputs.pr_number}}



# - name: set remote and merge
Expand Down

0 comments on commit b2aa419

Please sign in to comment.