Skip to content

Commit

Permalink
Merge pull request #791 from google/upload-artifact-v4-name-conflict
Browse files Browse the repository at this point in the history
Run the ci-done on each `runs-on`, and separate test result upload by platform.
  • Loading branch information
jaqx0r authored Jan 7, 2024
2 parents 4616b3e + 2517874 commit 55bdc1d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci-done.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ on:
- completed
jobs:
comment:
runs-on: ubuntu-latest
strategy:
matrix:
# Sync with matrix in ci.yml
runs-on: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.runs-on }}
permissions:
# list and download
actions: read
Expand All @@ -24,7 +28,7 @@ jobs:
run_id: ${{github.event.workflow_run.id }},
});
var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
return artifact.name == "test-results"
return artifact.name == "test-results-${{ matrix.runs-on }}"
})[0];
var download = await github.rest.actions.downloadArtifact({
owner: context.repo.owner,
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
strategy:
matrix:
# macos-latest is slow and has weird test failures with unixgram message sizes, so it's been disabled.
# Sync with matrix in ci-done.yml
runs-on: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.runs-on }}
steps:
Expand Down Expand Up @@ -52,7 +53,7 @@ jobs:
- uses: actions/upload-artifact@v4
if: always()
with:
name: test-results
name: test-results-${{ matrix.runs-on }}
path: test-results/

container:
Expand Down

0 comments on commit 55bdc1d

Please sign in to comment.