Merge branch 'ci/remove_target'

lucasssvaz · lucasssvaz · commit fe58ac0ee092 · 2024-06-18T19:19:22.000-03:00
diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml
@@ -20,7 +20,6 @@ jobs:
       id: ${{ github.event.pull_request.number || github.ref }}-${{ github.event.pull_request.head.sha || github.sha }}-${{ inputs.chip }}-${{ inputs.type }}
     steps:
       - name: Check if already built
-        if: ${{ github.event.pull_request.number != null }}
         id: cache-build-binaries
         uses: actions/cache/restore@v4
         with:
diff --git a/.github/workflows/hw.yml b/.github/workflows/hw.yml
@@ -22,8 +22,7 @@ jobs:
       image: python:3.10.1-bullseye
       options: --privileged
     steps:
-      - name: Check if already built
-        if: ${{ github.event.pull_request.number != null }}
+      - name: Check if already passed
         id: cache-results
         uses: actions/cache/restore@v4
         with:
@@ -80,7 +79,7 @@ jobs:
 
       - name: Upload ${{ inputs.chip }} ${{ inputs.type }} hardware results as cache
         uses: actions/cache/save@v4
-        if: ${{ always() && steps.check-tests.outputs.enabled == 'true' }}
+        if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         with:
           key: tests-${{ env.id }}-results-hw
           path: |
diff --git a/.github/workflows/qemu.yml b/.github/workflows/qemu.yml
@@ -18,8 +18,7 @@ jobs:
       QEMU_INSTALL_PATH: "$HOME"
     runs-on: ubuntu-latest
     steps:
-      - name: Check if already run
-        if: ${{ github.event.pull_request.number != null }}
+      - name: Check if already passed
         id: get-cache-results
         uses: actions/cache/restore@v4
         with:
@@ -125,7 +124,7 @@ jobs:
 
       - name: Upload ${{ inputs.chip }} ${{ inputs.type }} QEMU results as cache
         uses: actions/cache/save@v4
-        if: ${{ always() && steps.check-tests.outputs.enabled == 'true' }}
+        if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         with:
           key: tests-${{ env.id }}-results-qemu
           path: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,6 +5,19 @@ on:
   pull_request:
     types: [opened, reopened, synchronize, labeled, unlabeled]
     paths:
+      - '.github/workflows/tests.yml'
+      - '.github/workflows/build_tests.yml'
+      - '.github/workflows/hw.yml'
+      - '.github/workflows/qemu.yml'
+      - '.github/workflows/wokwi.yml'
+      - '.github/workflows/tests_publish.yml'
+      - '.github/scripts/*.sh'
+      - '!.github/scripts/check-cmakelists.sh'
+      - '!.github/scripts/find_*'
+      - '!.github/scripts/on-*.sh'
+      - '!.github/scripts/set_push_chunks.sh'
+      - '!.github/scripts/update-version.sh'
+      - '!.github/scripts/upload_py_tools.sh'
       - 'tests/**'
       - 'cores/**'
       - 'libraries/**'
@@ -74,6 +87,8 @@ jobs:
       type: ${{ matrix.type }}
       chip: ${{ matrix.chip }}
 
+  # Wokwi tests are run after this workflow as it needs access to secrets
+
   call-hardware-tests:
     name: Hardware
     uses: ./.github/workflows/hw.yml
@@ -91,8 +106,6 @@ jobs:
       type: ${{ matrix.type }}
       chip: ${{ matrix.chip }}
 
-  # Wokwi tests are run after this workflow as it needs access to secrets
-
   # This job is disabled for now
   call-qemu-tests:
     name: QEMU
diff --git a/.github/workflows/tests_publish.yml b/.github/workflows/tests_publish.yml
@@ -22,39 +22,26 @@ jobs:
         checks: write
         pull-requests: write
     steps:
-      - name: Print info
-        run: |
-          echo "Event: ${{ github.event.workflow_run.event }}"
-          echo "Conclusion: ${{ github.event.workflow_run.conclusion }}"
-          echo "Status: ${{ github.event.workflow_run.status }}"
-          echo "Head SHA: ${{ github.event.workflow_run.head_sha }}"
-          echo "Parent Run ID: ${{ github.event.workflow_run.id }}"
-          echo "Run Number: ${{ github.run_number }}"
-          echo "Run ID: ${{ github.run_id }}"
-          echo "Ref: ${{ github.ref }}"
-
       - name: Download and Extract Artifacts
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          workflow: tests.yml
-          commit: ${{ github.event.workflow_run.head_sha }}
-          path: ./artifacts
-          allow_forks: true
-
-      - name: Download and Extract Wokwi Results
         uses: dawidd6/action-download-artifact@v6
         with:
           run_id: ${{ github.event.workflow_run.id }}
           path: ./artifacts
 
-      - name: List files
+      - name: Get original info
         run: |
-          ls -R ./artifacts
+          original_event=$(cat ./artifacts/event.txt)
+          original_sha=$(cat ./artifacts/sha.txt)
+          echo "original_event=$original_event" >> $GITHUB_ENV
+          echo "original_sha=$original_sha" >> $GITHUB_ENV
+
+          echo "original_event = $original_event"
+          echo "original_sha = $original_sha"
 
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
-          commit: ${{ github.event.workflow_run.head_sha }}
+          commit: ${{ env.original_sha }}
           event_file: ./artifacts/event_file/event.json
-          event_name: ${{ github.event.workflow_run.event }}
+          event_name: ${{ env.original_event }}
           files: ./artifacts/**/*.xml
diff --git a/.github/workflows/wokwi.yml b/.github/workflows/wokwi.yml
@@ -13,15 +13,121 @@ env:
   WOKWI_TIMEOUT: 600000 # Milliseconds
 
 jobs:
+  get-artifacts:
+    name: Get required artifacts
+    runs-on: ubuntu-latest
+    outputs:
+      ref: ${{ steps.set-ref.outputs.ref }}
+    steps:
+      - name: Report pending
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const owner = '${{ github.repository_owner }}';
+            const repo = '${{ github.repository }}'.split('/')[1];
+            const sha = '${{ github.event.workflow_run.head_sha }}';
+            core.debug(`owner: ${owner}`);
+            core.debug(`repo: ${repo}`);
+            core.debug(`sha: ${sha}`);
+            const { context: name, state } = (await github.rest.repos.createCommitStatus({
+              context: 'Runtime Tests / Wokwi (Get artifacts) (${{ github.event.workflow_run.event }} => workflow_run)',
+              owner: owner,
+              repo: repo,
+              sha: sha,
+              state: 'pending',
+              target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+            })).data;
+            core.info(`${name} is ${state}`);
+
+      - name: Download and extract event file
+        uses: actions/download-artifact@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+          name: event_file
+          path: artifacts/event_file
+
+      - name: Try to read PR number
+        id: set-ref
+        run: |
+          ref=$(jq -r '.pull_request.number' artifacts/event_file/event.json)
+          if [ -z "$ref" ] || [ "$ref" == "null" ]; then
+            ref=${{ github.ref }}
+          fi
+
+          echo "ref = $ref"
+          printf "${{ github.event.workflow_run.event }}" >> artifacts/event.txt
+          printf "Event name = "
+          cat artifacts/event.txt
+          printf "${{ github.event.workflow_run.head_sha || github.sha }}" >> artifacts/sha.txt
+          printf "Head SHA = "
+          cat artifacts/sha.txt
+
+          if [ -z "$ref" ] || [ "$ref" == "null" ]; then
+            echo "Failed to get PR number or ref"
+            exit 1
+          fi
+
+          echo "ref=$ref" >> $GITHUB_OUTPUT
+
+      - name: Download and extract parent hardware results
+        uses: actions/download-artifact@v4
+        continue-on-error: true
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+          pattern: tests-results-hw-*
+          merge-multiple: true
+          path: artifacts/results/hw
+
+      - name: Download and extract parent QEMU results
+        uses: actions/download-artifact@v4
+        continue-on-error: true
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+          pattern: tests-results-qemu-*
+          merge-multiple: true
+          path: artifacts/results/qemu
+
+      - name: Upload parent artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: parent-artifacts
+          path: artifacts
+          if-no-files-found: error
+
+      - name: Report conclusion
+        uses: actions/github-script@v7
+        if: always()
+        with:
+          script: |
+            const owner = '${{ github.repository_owner }}';
+            const repo = '${{ github.repository }}'.split('/')[1];
+            const sha = '${{ github.event.workflow_run.head_sha }}';
+            core.debug(`owner: ${owner}`);
+            core.debug(`repo: ${repo}`);
+            core.debug(`sha: ${sha}`);
+            const { context: name, state } = (await github.rest.repos.createCommitStatus({
+              context: 'Runtime Tests / Wokwi (Get artifacts)',
+              owner: owner,
+              repo: repo,
+              sha: sha,
+              state: '${{ job.status }}',
+              target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+            })).data;
+            core.info(`${name} is ${state}`);
+
   wokwi-test:
     name: Wokwi ${{ matrix.chip }} ${{ matrix.type }} tests
     if: |
       github.event.workflow_run.conclusion == 'success' ||
       github.event.workflow_run.conclusion == 'failure' ||
       github.event.workflow_run.conclusion == 'timed_out'
     runs-on: ubuntu-latest
+    needs: get-artifacts
     env:
-      id: ${{ github.event.workflow_run.head_sha }}-${{ matrix.chip }}-${{ matrix.type }}
+      id: ${{ needs.get-artifacts.outputs.ref }}-${{ github.event.workflow_run.head_sha || github.sha }}-${{ matrix.chip }}-${{ matrix.type }}
     permissions:
       actions: read
       statuses: write
@@ -42,7 +148,7 @@ jobs:
             core.debug(`repo: ${repo}`);
             core.debug(`sha: ${sha}`);
             const { context: name, state } = (await github.rest.repos.createCommitStatus({
-              context: 'Runtime Tests / Wokwi (${{ matrix.type }}, ${{ matrix.chip }})',
+              context: 'Runtime Tests / Wokwi (${{ matrix.type }}, ${{ matrix.chip }}) (${{ github.event.workflow_run.event }} => workflow_run)',
               owner: owner,
               repo: repo,
               sha: sha,
@@ -51,7 +157,7 @@ jobs:
             })).data;
             core.info(`${name} is ${state}`);
 
-      - name: Check if already run
+      - name: Check if already passed
         id: get-cache-results
         uses: actions/cache/restore@v4
         with:
@@ -73,24 +179,10 @@ jobs:
 
           echo "enabled=$enabled" >> $GITHUB_OUTPUT
 
-      - name: Checkout user repository
+      # Note that changes to the workflows and tests will only be picked up after the PR is merged
+      - name: Checkout repository
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.workflow_run.head_sha }}
-          persist-credentials: false
-          sparse-checkout-cone-mode: false
-          sparse-checkout: |
-            /*
-            !.github
-
-      # To avoid giving unknown scripts elevated permissions, download them from the master branch
-      - name: Get CI scripts from master
-        if: ${{ steps.check-tests.outputs.enabled == 'true' }}
-        run: |
-          mkdir -p .github
-          cd .github
-          curl https://codeload.github.com/${{ github.repository }}/tar.gz/master | tar -xz --strip=2 arduino-esp32-master/.github
 
       - uses: actions/setup-python@v5
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
@@ -113,24 +205,6 @@ jobs:
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         uses: wokwi/wokwi-ci-server-action@v1
 
-      # - name: Download and Extract Artifacts
-      #   run: |
-      #     artifacts_url=${{ github.event.workflow_run.artifacts_url }}
-      #     gh api "$artifacts_url" -q '.artifacts[] | [.name, .archive_download_url] | @tsv' | while read artifact
-      #     do
-      #       IFS=$'\t' read name url <<< "$artifact"
-      #       gh api $url > "$name.zip"
-      #       unzip -j "$name.zip" -d "temp_$name"
-      #       if [[ "$name" == "pr_number" ]]; then
-      #         mv "temp_$name"/* workflows
-      #       else
-      #         mv "temp_$name"/* libraries-report
-      #       fi
-      #       rm -r "temp_$name"
-      #     done
-      #     echo "Contents of parent directory:"
-      #     ls -R ..
-
       - name: Get binaries
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         uses: actions/download-artifact@v4
@@ -150,7 +224,7 @@ jobs:
 
       - name: Upload ${{ matrix.chip }} ${{ matrix.type }} Wokwi results as cache
         uses: actions/cache/save@v4
-        if: ${{ always() && steps.check-tests.outputs.enabled == 'true' }}
+        if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         with:
           key: tests-${{ env.id }}-results-wokwi
           path: |
