From 7233db06887d23ab91451d327b5798465fa0a950 Mon Sep 17 00:00:00 2001 From: Piotr Narajowski Date: Mon, 22 Jul 2024 15:08:03 +0200 Subject: [PATCH] workflow final fix hopefully final workflow fix --- .github/check_for_changes.py | 9 ++------- .github/workflows/run_cron_from_pr.yaml | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/check_for_changes.py b/.github/check_for_changes.py index bcc55eb256..c80939d23a 100644 --- a/.github/check_for_changes.py +++ b/.github/check_for_changes.py @@ -3,11 +3,6 @@ import sys -def run_cmd(cmd: str) -> list[str]: - out = subprocess.check_output(cmd, text=True, shell=True) - return out.splitlines() - - def main(): # Check if the target directory exists if not os.path.exists('autopts/wid/'): @@ -15,10 +10,10 @@ def main(): return try: - print(os.environ) pr_number = os.environ.get('PR_NUMBER') fetch_str = f"refs/pull/{pr_number}/merge" - fetch = subprocess.run( + + subprocess.run( ['git', 'fetch', 'origin', fetch_str], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=True ) diff --git a/.github/workflows/run_cron_from_pr.yaml b/.github/workflows/run_cron_from_pr.yaml index 9ac7794e67..3df5b3191d 100644 --- a/.github/workflows/run_cron_from_pr.yaml +++ b/.github/workflows/run_cron_from_pr.yaml @@ -18,40 +18,42 @@ jobs: with: fetch-depth: 2 - - name: Display PR Number (debug) - run: echo "PR Number is ${{ env.PR_NUMBER }}" - - name: Check for changes in autopts/wid directory id: check_changes run: | python .github/check_for_changes.py - if [ -s changed_files_formatted.txt ]; then + if [ -z changed_files_formatted.txt ]; then echo "changes_detected=true" >> $GITHUB_OUTPUT else echo "changes_detected=false" >> $GITHUB_OUTPUT exit 0 fi - - name: Print Current Working Directory - run: | - pwd - - name: Set output id: set_output - if: ${{ steps.check_changes.outputs.changes_detected }} == 'true' + if: ( steps.check_changes.outputs.changes_detected == 'true' ) run: | echo "changed_files=$(cat changed_files_formatted.txt)" >> $GITHUB_OUTPUT - name: Print changed - if: ${{ steps.check_changes.outputs.changes_detected }} == 'true' + if: ( steps.check_changes.outputs.changes_detected == 'true' ) run: | echo "Changed files: ${{ steps.set_output.outputs.changed_files }}" - name: Post comment on PR - if: ${{ steps.check_changes.outputs.changes_detected }} == 'true' + if: ( steps.check_changes.outputs.changes_detected == 'true' ) uses: peter-evans/create-or-update-comment@v4 with: token: ${{ secrets.GITHUB_TOKEN }} issue-number: ${{ github.event.pull_request.number }} body: | \#AutoPTS run mynewt ${{ steps.set_output.outputs.changed_files }} --test-case-limit 10 + + - name: Post comment on PR + if: ( steps.check_changes.outputs.changes_detected == 'true' ) + uses: peter-evans/create-or-update-comment@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + issue-number: ${{ github.event.pull_request.number }} + body: | + \#AutoPTS run zephyr ${{ steps.set_output.outputs.changed_files }} --test-case-limit 10