fix(repo): fix nightly reporting (#30104)

This PR fixes broken reporting on nightly caused by breaking changes in
the `upload-artifact` and `download-artifact` GH actions

## Current Behavior
<!-- This is the behavior we have today -->

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #
This commit is contained in:
Miroslav Jonaš 2025-02-19 13:28:34 +01:00 committed by GitHub
parent 42e860d3ea
commit 2a4984cf7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 16 deletions

View File

@ -506,19 +506,16 @@ jobs:
matrix=$(( matrix=$((
echo '${{ toJSON(matrix) }}' echo '${{ toJSON(matrix) }}'
) | jq --argjson delta $delta -c '. + { "status": "${{ steps.e2e-run.outcome}}", "duration": $delta }') ) | jq --argjson delta $delta -c '. + { "status": "${{ steps.e2e-run.outcome}}", "duration": $delta }')
echo "$matrix" > matrix echo "$matrix" > 'outputs/matrix.json'
path=outputs/${{ matrix.os_name}}-${{ matrix.node_version}}-${{ matrix.package_manager}}-${{ matrix.project }}
echo "path=$path" >> $GITHUB_OUTPUT
echo "$matrix" > $path
- name: Upload matrix config - name: Upload matrix config
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: ${{ always() }} if: ${{ always() }}
with: with:
name: outputs name: ${{ matrix.os_name}}-${{ matrix.node_version}}-${{ matrix.package_manager}}-${{ matrix.project }}
overwrite: true overwrite: true
if-no-files-found: 'ignore' if-no-files-found: 'ignore'
path: ${{ steps.save-matrix.outputs.path }} path: 'outputs/matrix.json'
- name: Setup tmate session - name: Setup tmate session
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled && failure() }} if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled && failure() }}
@ -535,16 +532,18 @@ jobs:
pm-duration: ${{ steps.process-json.outputs.SLACK_PM_DURATION }} pm-duration: ${{ steps.process-json.outputs.SLACK_PM_DURATION }}
codeowners: ${{ steps.process-json.outputs.CODEOWNERS }} codeowners: ${{ steps.process-json.outputs.CODEOWNERS }}
steps: steps:
- name: Prepare dir for output
run: mkdir -p outputs
- name: Load outputs - name: Load outputs
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: outputs
path: outputs path: outputs
- name: Join and stringify matrix configs - name: Join and stringify matrix configs
id: combine-json id: combine-json
run: | run: |
combined=$((jq -s . outputs/*) | jq tostring) combined=$((jq -s . outputs/*/matrix.json) | jq tostring)
echo "combined=$combined" >> $GITHUB_OUTPUT echo "combined=$combined" >> $GITHUB_OUTPUT
- name: Make slack outputs - name: Make slack outputs

View File

@ -364,19 +364,16 @@ jobs:
matrix=$(( matrix=$((
echo '${{ toJSON(matrix) }}' echo '${{ toJSON(matrix) }}'
) | jq -c '. + { "status": "${{ steps.e2e-run.outcome}}" }') ) | jq -c '. + { "status": "${{ steps.e2e-run.outcome}}" }')
echo "$matrix" > matrix echo "$matrix" > 'outputs/matrix.json'
path=outputs/windows-${{ matrix.node_version}}-${{ matrix.package_manager}}-${{ matrix.project }}
echo "path=$path" >> $GITHUB_OUTPUT
echo "$matrix" > $path
- name: Upload matrix config - name: Upload matrix config
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
if: ${{ always() }} if: ${{ always() }}
with: with:
name: outputs name: windows-${{ matrix.node_version}}-${{ matrix.package_manager}}-${{ matrix.project }}
overwrite: true overwrite: true
if-no-files-found: 'ignore' if-no-files-found: 'ignore'
path: ${{ steps.save-matrix.outputs.path }} path: 'outputs/matrix.json'
- name: Setup tmate session - name: Setup tmate session
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled && failure() }} if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled && failure() }}
@ -393,17 +390,19 @@ jobs:
message: ${{ steps.process-json.outputs.SLACK_MESSAGE }} message: ${{ steps.process-json.outputs.SLACK_MESSAGE }}
codeowners: ${{ steps.process-json.outputs.CODEOWNERS }} codeowners: ${{ steps.process-json.outputs.CODEOWNERS }}
steps: steps:
- name: Prepare dir for output
run: mkdir -p outputs
- name: Load outputs - name: Load outputs
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: outputs
path: outputs path: outputs
- name: Join and stringify matrix configs - name: Join and stringify matrix configs
id: combine-json id: combine-json
shell: bash shell: bash
run: | run: |
combined=$((jq -s . outputs/*) | jq tostring) combined=$((jq -s . outputs/*/matrix.json) | jq tostring)
echo "combined=$combined" >> $GITHUB_OUTPUT echo "combined=$combined" >> $GITHUB_OUTPUT
- name: Make slack outputs - name: Make slack outputs