diff --git a/.github/workflows/hkg_dev_updater.yml b/.github/workflows/hkg_dev_updater.yml index 6819fa411b1929..f5a6627e4d5aec 100644 --- a/.github/workflows/hkg_dev_updater.yml +++ b/.github/workflows/hkg_dev_updater.yml @@ -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 @@ -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 diff --git a/.github/workflows/pr-from-hkg-dev.yml b/.github/workflows/pr-from-hkg-dev.yml index c3d26c9d43921a..ba7a7d901257b8 100644 --- a/.github/workflows/pr-from-hkg-dev.yml +++ b/.github/workflows/pr-from-hkg-dev.yml @@ -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