Skip to content

Commit

Permalink
Merge pull request #468 from actions/robherley/misc-updates
Browse files Browse the repository at this point in the history
Some cleanup
  • Loading branch information
robherley authored Dec 14, 2023
2 parents c7d193f + 6c139af commit 3530730
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
id: diff

# If index.js was different than expected, upload the expected version as an artifact
- uses: actions/upload-artifact@v4-beta
- uses: actions/upload-artifact@v4
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
with:
name: dist
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
# Download Artifact #1 and verify the correctness of the content
- name: 'Download artifact #1'
uses: actions/download-artifact@v4-beta
uses: actions/download-artifact@v4
with:
name: 'Artifact-A-${{ matrix.runs-on }}'
path: some/new/path
Expand All @@ -101,7 +101,7 @@ jobs:

# Download Artifact #2 and verify the correctness of the content
- name: 'Download artifact #2'
uses: actions/download-artifact@v4-beta
uses: actions/download-artifact@v4
with:
name: 'Artifact-Wildcard-${{ matrix.runs-on }}'
path: some/other/path
Expand All @@ -122,7 +122,7 @@ jobs:

# Download Artifact #4 and verify the correctness of the content
- name: 'Download artifact #4'
uses: actions/download-artifact@v4-beta
uses: actions/download-artifact@v4
with:
name: 'Multi-Path-Artifact-${{ matrix.runs-on }}'
path: multi/artifact
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ You can use `~` in the path input as a substitute for `$HOME`. Basic tilde expan
echo hello > ~/new/artifact/world.txt
- uses: actions/upload-artifact@v4
with:
name: Artifacts-V4-beta
name: my-artifacts
path: ~/new/**/*
```

Expand Down
6 changes: 2 additions & 4 deletions src/upload-artifact.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import * as core from '../node_modules/@actions/core/'
import artifact, {
UploadArtifactOptions
} from '../node_modules/@actions/artifact/lib/artifact'
import * as core from '@actions/core'
import artifact, {UploadArtifactOptions} from '@actions/artifact'
import {findFilesToUpload} from './search'
import {getInputs} from './input-helper'
import {NoFileOptions} from './constants'
Expand Down

0 comments on commit 3530730

Please sign in to comment.