Skip to content

Commit

Permalink
add additional integration test for merge all behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
robherley committed Jan 23, 2024
1 parent 90b0f8e commit 53ef698
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 7 deletions.
49 changes: 42 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,27 +181,61 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

# Merge Artifact-A-* from previous jobs
- name: Merge
# Merge all artifacts from previous jobs
- name: Merge all artifacts in run
uses: ./merge/
with:
# our matrix produces artifacts with the same file, this prevents "stomping" on each other, also makes it
# easier to identify each of the merged artifacts
separate-directories: true
- name: 'Download merged artifacts'
uses: actions/download-artifact@v4
with:
name: Merged-Artifacts
path: all-merged-artifacts
- name: 'Check merged artifact has directories for each artifact'
run: |
$artifacts = @(
"Artifact-A-ubuntu-latest",
"Artifact-A-macos-latest",
"Artifact-A-windows-latest",
"Artifact-Wildcard-ubuntu-latest",
"Artifact-Wildcard-macos-latest",
"Artifact-Wildcard-windows-latest",
"Multi-Path-Artifact-ubuntu-latest",
"Multi-Path-Artifact-macos-latest",
"Multi-Path-Artifact-windows-latest"
)
foreach ($artifact in $artifacts) {
$path = "all-merged-artifacts/$artifact"
if (!(Test-Path $path)) {
Write-Error "$path does not exist."
}
}
shell: pwsh

# Merge Artifact-A-* from previous jobs
- name: Merge all Artifact-A
uses: ./merge/
with:
name: Merged-Artifact-As
pattern: 'Artifact-A-*'
separate-directories: true

# Download merged artifacts and verify the correctness of the content
- name: 'Download merged artifacts'
uses: actions/download-artifact@v4
with:
name: Merged-Artifacts
path: merged-artifacts
name: Merged-Artifact-As
path: merged-artifact-a

- name: 'Verify merged artifacts'
run: |
$files = @(
"merged-artifacts/Artifact-A-ubuntu-latest/file1.txt",
"merged-artifacts/Artifact-A-macos-latest/file1.txt",
"merged-artifacts/Artifact-A-windows-latest/file1.txt"
"merged-artifact-a/Artifact-A-ubuntu-latest/file1.txt",
"merged-artifact-a/Artifact-A-macos-latest/file1.txt",
"merged-artifact-a/Artifact-A-windows-latest/file1.txt"
)
foreach ($file in $files) {
Expand All @@ -214,3 +248,4 @@ jobs:
}
}
shell: pwsh

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ The release of upload-artifact@v4 and download-artifact@v4 are major changes to

For more information, see the [`@actions/artifact`](https://github.com/actions/toolkit/tree/main/packages/artifact) documentation.

There is also a new sub-action, `actions/upload-artifact/merge`. For more info, check out that action's [README](./merge/README.md).

### Improvements

1. Uploads are significantly faster, upwards of 90% improvement in worst case scenarios.
Expand Down

0 comments on commit 53ef698

Please sign in to comment.