From 60f1ee69bb2a7b14406dca6722c7f1b3fb1f82e8 Mon Sep 17 00:00:00 2001 From: jc01rho Date: Thu, 5 May 2022 19:44:58 +0900 Subject: [PATCH 1/4] fixed actions --- .github/workflows/hkg_dev_updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hkg_dev_updater.yml b/.github/workflows/hkg_dev_updater.yml index 6819fa411b1929..f6ac5b727b6c8e 100644 --- a/.github/workflows/hkg_dev_updater.yml +++ b/.github/workflows/hkg_dev_updater.yml @@ -38,5 +38,5 @@ jobs: - name: New commits found # if: steps.sync.outputs.has_new_commits == 'true' - uses: ./.github/workflows/pr-from-hkg-dev + uses: ./.github/workflows/pr-from-hkg-dev.yml From 2ab38a834df72d522224dd3029e56ad77b8fba40 Mon Sep 17 00:00:00 2001 From: jc01rho Date: Thu, 5 May 2022 19:56:51 +0900 Subject: [PATCH 2/4] fixed actions --- .github/workflows/hkg_dev_updater.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/hkg_dev_updater.yml b/.github/workflows/hkg_dev_updater.yml index f6ac5b727b6c8e..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.yml + 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 From 88b01ab4deb2d30ce32e194372c30501b8fb5d4c Mon Sep 17 00:00:00 2001 From: jc01rho Date: Thu, 5 May 2022 20:10:15 +0900 Subject: [PATCH 3/4] fixed actions --- .github/workflows/pr-from-hkg-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-from-hkg-dev.yml b/.github/workflows/pr-from-hkg-dev.yml index c3d26c9d43921a..b6d879bf687cc1 100644 --- a/.github/workflows/pr-from-hkg-dev.yml +++ b/.github/workflows/pr-from-hkg-dev.yml @@ -31,8 +31,8 @@ jobs: with: destination_branch: "feature/0814" github_token: ${{ secrets.GITHUB_TOKEN }} - pr_reviewer: "jc01rho" # Comma-separated list (no spaces) - pr_assignee: "jc01rho" +# pr_reviewer: "jc01rho" # Comma-separated list (no spaces) +# pr_assignee: "jc01rho" pr_label: "automerge" - uses: peter-evans/enable-pull-request-automerge@v2 From 374d9eeecc0108f66a2ba31ae9b34186d46610cf Mon Sep 17 00:00:00 2001 From: jc01rho Date: Thu, 5 May 2022 20:14:22 +0900 Subject: [PATCH 4/4] fixed actions --- .github/workflows/pr-from-hkg-dev.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-from-hkg-dev.yml b/.github/workflows/pr-from-hkg-dev.yml index b6d879bf687cc1..ba7a7d901257b8 100644 --- a/.github/workflows/pr-from-hkg-dev.yml +++ b/.github/workflows/pr-from-hkg-dev.yml @@ -31,14 +31,11 @@ jobs: with: destination_branch: "feature/0814" github_token: ${{ secrets.GITHUB_TOKEN }} -# pr_reviewer: "jc01rho" # Comma-separated list (no spaces) + pr_reviewer: "jc01rho" # Comma-separated list (no spaces) # 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