Merge pull request #436 from bethanyj28/main

Bump @actions/artifact version

README.md

@@ -1,6 +1,4 @@
-# Upload-Artifact v4 beta
-
-❗ Not publicly available. If you try to use this version then it will fail. Available only internally at GitHub while in development. Stay tuned for public announcements soon about broader availability❗
+# Upload-Artifact v3
 
 This uploads artifacts from your workflow allowing you to share data between jobs and store data once a workflow is complete.
 
@@ -8,11 +6,19 @@ See also [download-artifact](https://github.com/actions/download-artifact).
 
 # What's new
 
-🚧 Under construction 🚧
+- Easier upload
+  - Specify a wildcard pattern
+  - Specify an individual file
+  - Specify a directory (previously you were limited to only this option)
+  - Multi path upload
+    - Use a combination of individual files, wildcards or directories
+    - Support for excluding certain files
+- Upload an artifact without providing a name
+- Fix for artifact uploads sometimes not working with containers
+- Proxy support out of the box
+- Port entire action to typescript from a runner plugin so it is easier to collaborate and accept contributions
 
-Big changes coming...
-
-Refer [here](https://github.com/actions/upload-artifact/tree/releases/v3) for the previous version
+Refer [here](https://github.com/actions/upload-artifact/tree/releases/v1) for the previous version
 
 # Usage
 
@@ -28,7 +34,7 @@ steps:
 
 - run: echo hello > path/to/artifact/world.txt
 
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   with:
     name: my-artifact
     path: path/to/artifact/world.txt
@@ -37,7 +43,7 @@ steps:
 ### Upload an Entire Directory
 
 ```yaml
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   with:
     name: my-artifact
     path: path/to/artifact/ # or path/to/artifact
@@ -46,7 +52,7 @@ steps:
 ### Upload using a Wildcard Pattern
 
 ```yaml
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   with:
     name: my-artifact
     path: path/**/[abc]rtifac?/*
@@ -55,7 +61,7 @@ steps:
 ### Upload using Multiple Paths and Exclusions
 
 ```yaml
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   with:
     name: my-artifact
     path: |
@@ -91,7 +97,7 @@ The [@actions/artifact](https://github.com/actions/toolkit/tree/main/packages/ar
 If a path (or paths), result in no files being found for the artifact, the action will succeed but print out a warning. In certain scenarios it may be desirable to fail the action or suppress the warning. The `if-no-files-found` option allows you to customize the behavior of the action if no files are found:
 
 ```yaml
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   with:
     name: my-artifact
     path: path/to/artifact/
@@ -103,7 +109,7 @@ If a path (or paths), result in no files being found for the artifact, the actio
 To upload artifacts only when the previous step of a job failed, use [`if: failure()`](https://help.github.com/en/articles/contexts-and-expression-syntax-for-github-actions#job-status-check-functions):
 
 ```yaml
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   if: failure()
   with:
     name: my-artifact
@@ -115,7 +121,7 @@ To upload artifacts only when the previous step of a job failed, use [`if: failu
 You can upload an artifact without specifying a name
 
 ```yaml
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   with:
     path: path/to/artifact/world.txt
 ```
@@ -124,21 +130,51 @@ If not provided, `artifact` will be used as the default name which will manifest
 
 ### Uploading to the same artifact
 
-Unlike earlier versions of `upload-artifact`, uploading to the same artifact via multiple jobs is _not_ supported with `v4`. 
+With the following example, the available artifact (named `artifact` by default if no name is provided) would contain both `world.txt` (`hello`) and `extra-file.txt` (`howdy`):
 
 ```yaml
 - run: echo hi > world.txt
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   with:
     path: world.txt
 
 - run: echo howdy > extra-file.txt
-- uses: actions/upload-artifact@v4-beta
+- uses: actions/upload-artifact@v3
   with:
     path: extra-file.txt
+
+- run: echo hello > world.txt
+- uses: actions/upload-artifact@v3
+  with:
+    path: world.txt
 ```
 
-Artifact names must be unique since each created artifact is idempotent so multiple jobs cannot modify the same artifact.
+Each artifact behaves as a file share. Uploading to the same artifact multiple times in the same workflow can overwrite and append already uploaded files:
+
+```yaml
+    strategy:
+      matrix:
+          node-version: [8.x, 10.x, 12.x, 13.x]
+    steps:
+        - name: Create a file
+          run: echo ${{ matrix.node-version }} > my_file.txt
+        - name: Accidentally upload to the same artifact via multiple jobs
+          uses: actions/upload-artifact@v3
+          with:
+              name: my-artifact
+              path: ${{ github.workspace }}
+```
+
+> **_Warning:_** Be careful when uploading to the same artifact via multiple jobs as artifacts may become corrupted. When uploading a file with an identical name and path in multiple jobs, uploads may fail with 503 errors due to conflicting uploads happening at the same time. Ensure uploads to identical locations to not interfere with each other.
+
+In the above example, four jobs will upload four different files to the same artifact but there will only be one file available when `my-artifact` is downloaded. Each job overwrites what was previously uploaded. To ensure that jobs don't overwrite existing artifacts, use a different name per job:
+
+```yaml
+          uses: actions/upload-artifact@v3
+          with:
+              name: my-artifact ${{ matrix.node-version }}
+              path: ${{ github.workspace }}
+```
 
 ### Environment Variables and Tilde Expansion
 
@@ -148,9 +184,9 @@ You can use `~` in the path input as a substitute for `$HOME`. Basic tilde expan
   - run: |
       mkdir -p ~/new/artifact
       echo hello > ~/new/artifact/world.txt
-  - uses: actions/upload-artifact@v4-beta
+  - uses: actions/upload-artifact@v3
     with:
-      name: Artifacts-V4-beta
+      name: Artifacts-V3
       path: ~/new/**/*
 ```
 
@@ -163,7 +199,7 @@ Environment variables along with context expressions can also be used for input.
     - run: |
         mkdir -p ${{ github.workspace }}/artifact
         echo hello > ${{ github.workspace }}/artifact/world.txt
-    - uses: actions/upload-artifact@v4-beta
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ env.name }}-name
         path: ${{ github.workspace }}/artifact/**/*
@@ -177,7 +213,7 @@ For environment variables created in other steps, make sure to use the `env` exp
         mkdir testing
         echo "This is a file to upload" > testing/file.txt
         echo "artifactPath=testing/file.txt" >> $GITHUB_ENV
-    - uses: actions/upload-artifact@v4-beta
+    - uses: actions/upload-artifact@v3
       with:
         name: artifact
         path: ${{ env.artifactPath }} # this will resolve to testing/file.txt at runtime
@@ -192,7 +228,7 @@ Artifacts are retained for 90 days by default. You can specify a shorter retenti
     run: echo "I won't live long" > my_file.txt
 
   - name: Upload Artifact
-    uses: actions/upload-artifact@v4-beta
+    uses: actions/upload-artifact@v3
     with:
       name: my-artifact
       path: my_file.txt
@@ -201,46 +237,6 @@ Artifacts are retained for 90 days by default. You can specify a shorter retenti
 
 The retention period must be between 1 and 90 inclusive. For more information see [artifact and log retention policies](https://docs.github.com/en/free-pro-team@latest/actions/reference/usage-limits-billing-and-administration#artifact-and-log-retention-policy).
 
-## Outputs
-
-If an artifact upload is successful then an `artifact-id` output is available. This ID is a unique identifier that can be used with [Artifact REST APIs](https://docs.github.com/en/rest/actions/artifacts).
-
-### Example output between steps
-
-```yml
-    - uses: actions/upload-artifact@v4-beta
-      id: artifact-upload-step
-      with:
-        name: my-artifact
-        path: path/to/artifact/content/
-
-    - name: Output artifact ID
-      run:  echo 'Artifact ID is ${{ steps.artifact-upload-step.outputs.artifact-id }}'
-```
-
-### Example output between jobs
-
-```yml
-jobs:
-  job1:
-    runs-on: ubuntu-latest
-    outputs:
-      output1: ${{ steps.my-artifact.outputs.artifact-id }}
-    steps:
-      - uses: actions/upload-artifact@v4-beta
-        id: artifact-upload-step
-        with:
-          name: my-artifact
-          path: path/to/artifact/content/
-  job2:
-    runs-on: ubuntu-latest
-    needs: job1
-    steps:
-      - env:
-          OUTPUT1: ${{needs.job1.outputs.output1}}
-        run: echo "Artifact ID from previous job is $OUTPUT1"
-```
-
 ## Where does the upload go?
 
 At the bottom of the workflow summary page, there is a dedicated section for artifacts. Here's a screenshot of something you might see:
@@ -249,7 +245,42 @@ At the bottom of the workflow summary page, there is a dedicated section for art
 
 There is a trashcan icon that can be used to delete the artifact. This icon will only appear for users who have write permissions to the repository.
 
-The size of the artifact is denoted in bytes. The displayed artifact size denotes the size of the zip that `upload-artifact` creates during upload.
+The size of the artifact is denoted in bytes. The displayed artifact size denotes the raw uploaded artifact size (the sum of all the individual files uploaded during the workflow run for the artifact), not the compressed size. When you click to download an artifact from the summary page, a compressed zip is created with all the contents of the artifact and the size of the zip that you download may differ significantly from the displayed size. Billing is based on the raw uploaded size and not the size of the zip.
+
+# Limitations
+
+### Zipped Artifact Downloads
+
+During a workflow run, files are uploaded and downloaded individually using the `upload-artifact` and `download-artifact` actions. However, when a workflow run finishes and an artifact is downloaded from either the UI or through the [download api](https://developer.github.com/v3/actions/artifacts/#download-an-artifact), a zip is dynamically created with all the file contents that were uploaded. There is currently no way to download artifacts after a workflow run finishes in a format other than a zip or to download artifact contents individually. One of the consequences of this limitation is that if a zip is uploaded during a workflow run and then downloaded from the UI, there will be a double zip created.
+
+### Permission Loss
+
+:exclamation: File permissions are not maintained during artifact upload :exclamation: For example, if you make a file executable using `chmod` and then upload that file, post-download the file is no longer guaranteed to be set as an executable.
+
+### Case Insensitive Uploads
+
+:exclamation: File uploads are case insensitive :exclamation: If you upload `A.txt` and `a.txt` with the same root path, only a single file will be saved and available during download.
+
+### Maintaining file permissions and case sensitive files
+
+If file permissions and case sensitivity are required, you can `tar` all of your files together before artifact upload. Post download, the `tar` file will maintain file permissions and case sensitivity:
+
+```yaml
+  - name: Tar files
+    run: tar -cvf my_files.tar /path/to/my/directory
+
+  - name: Upload Artifact
+    uses: actions/upload-artifact@v3
+    with:
+      name: my-artifact
+      path: my_files.tar
+```
+
+### Too many uploads resulting in 429 responses
+
+A very minute subset of users who upload a very very large amount of artifacts in a short period of time may see their uploads throttled or fail because of `Request was blocked due to exceeding usage of resource 'DBCPU' in namespace` or `Unable to copy file to server StatusCode=TooManyRequests`.
+
+To reduce the chance of this happening, you can reduce the number of HTTP calls made during artifact upload by zipping or archiving the contents of your artifact before an upload starts. As an example, imagine an artifact with 1000 files (each 10 Kb in size). Without any modification, there would be around 1000 HTTP calls made to upload the artifact. If you zip or archive the artifact beforehand, the number of HTTP calls can be dropped to single digit territory. Measures like this will significantly speed up your upload and prevent uploads from being throttled or in some cases fail.
 
 ## Additional Documentation
 

action.yml

@@ -23,12 +23,6 @@ inputs:
 
       Minimum 1 day.
       Maximum 90 days unless changed from the repository settings page.
-outputs:
-  artifact-id:
-    description: >
-      A unique identifier for the artifact that was just uploaded. Empty if artifact upload failed.
-
-      This ID can be used as input to other APIs to download, delete or get more information about an artifact: https://docs.github.com/en/rest/actions/artifacts
 runs:
-  using: 'node20'
+  using: 'node16'
   main: 'dist/index.js'

package-lock.json

@@ -9,7 +9,7 @@
       "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
-        "@actions/artifact": "^1.1.1",
+        "@actions/artifact": "^1.1.2",
         "@actions/core": "^1.10.0",
         "@actions/glob": "^0.3.0",
         "@actions/io": "^1.1.2"
@@ -32,9 +32,9 @@
       }
     },
     "node_modules/@actions/artifact": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-1.1.1.tgz",
-      "integrity": "sha512-Vv4y0EW0ptEkU+Pjs5RGS/0EryTvI6s79LjSV9Gg/h+O3H/ddpjhuX/Bi/HZE4pbNPyjGtQjbdFWphkZhmgabA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-1.1.2.tgz",
+      "integrity": "sha512-1gLONA4xw3/Q/9vGxKwkFdV9u1LE2RWGx/IpAqg28ZjprCnJFjwn4pA7LtShqg5mg5WhMek2fjpyH1leCmOlQQ==",
       "dependencies": {
         "@actions/core": "^1.9.1",
         "@actions/http-client": "^2.0.1",
@@ -6148,9 +6148,9 @@
   },
   "dependencies": {
     "@actions/artifact": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-1.1.1.tgz",
-      "integrity": "sha512-Vv4y0EW0ptEkU+Pjs5RGS/0EryTvI6s79LjSV9Gg/h+O3H/ddpjhuX/Bi/HZE4pbNPyjGtQjbdFWphkZhmgabA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-1.1.2.tgz",
+      "integrity": "sha512-1gLONA4xw3/Q/9vGxKwkFdV9u1LE2RWGx/IpAqg28ZjprCnJFjwn4pA7LtShqg5mg5WhMek2fjpyH1leCmOlQQ==",
       "requires": {
         "@actions/core": "^1.9.1",
         "@actions/http-client": "^2.0.1",

package.json

@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
-    "release": "ncc build src/upload-artifact.ts && git add -f dist/index.js",
+    "release": "ncc build src/upload-artifact.ts && git add -f dist/",
     "check-all": "concurrently \"npm:format-check\" \"npm:lint\" \"npm:test\" \"npm:build\"",
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/actions/upload-artifact#readme",
   "dependencies": {
-    "@actions/artifact": "^2.0.0",
+    "@actions/artifact": "^1.1.2",
     "@actions/core": "^1.10.0",
     "@actions/glob": "^0.3.0",
     "@actions/io": "^1.1.2"

src/upload-artifact.ts

@@ -1,5 +1,5 @@
-import * as core from '../node_modules/@actions/core/'
-import {UploadOptions, create} from '../node_modules/@actions/artifact/lib/artifact'
+import * as core from '@actions/core'
+import {create, UploadOptions} from '@actions/artifact'
 import {findFilesToUpload} from './search'
 import {getInputs} from './input-helper'
 import {NoFileOptions} from './constants'
@@ -37,8 +37,16 @@ async function run(): Promise<void> {
       )
       core.debug(`Root artifact directory is ${searchResult.rootDirectory}`)
 
+      if (searchResult.filesToUpload.length > 10000) {
+        core.warning(
+          `There are over 10,000 files in this artifact, consider creating an archive before upload to improve the upload performance.`
+        )
+      }
+
       const artifactClient = create()
-      const options: UploadOptions = {}
+      const options: UploadOptions = {
+        continueOnError: false
+      }
       if (inputs.retentionDays) {
         options.retentionDays = inputs.retentionDays
       }
@@ -50,15 +58,14 @@ async function run(): Promise<void> {
         options
       )
 
-      if (uploadResponse.success === false) {
+      if (uploadResponse.failedItems.length > 0) {
         core.setFailed(
-          `An error was encountered when uploading ${inputs.artifactName}.`
+          `An error was encountered when uploading ${uploadResponse.artifactName}. There were ${uploadResponse.failedItems.length} items that failed to upload.`
         )
       } else {
         core.info(
-          `Artifact ${inputs.artifactName} has been successfully uploaded! Final size is ${uploadResponse.size} bytes. Artifact ID is ${uploadResponse.id}`
+          `Artifact ${uploadResponse.artifactName} has been successfully uploaded!`
         )
-        core.setOutput('artifact-id', uploadResponse.id)
       }
     }
   } catch (error) {