mirror of
				https://gitea.com/actions/upload-artifact.git
				synced 2025-10-30 08:38:15 +07:00 
			
		
		
		
	Merge pull request #625 from actions/robherley/artifact-2.1.10
Update @actions/artifact to latest version, includes symlink and timeout fixes
This commit is contained in:
		
						commit
						604373da63
					
				
							
								
								
									
										31
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										31
									
								
								.github/workflows/test.yml
									
									
									
									
										vendored
									
									
								
							| @ -46,14 +46,18 @@ jobs: | |||||||
|     - name: Test |     - name: Test | ||||||
|       run: npm run test |       run: npm run test | ||||||
| 
 | 
 | ||||||
|     # Test end-to-end by uploading two artifacts and then downloading them |     # Test end-to-end by uploading a few artifacts and then downloading them | ||||||
|     - name: Create artifact files |     - name: Create artifact files | ||||||
|       run: | |       run: | | ||||||
|         mkdir -p path/to/dir-1 |         mkdir -p path/to/dir-1 | ||||||
|         mkdir -p path/to/dir-2 |         mkdir -p path/to/dir-2 | ||||||
|         mkdir -p path/to/dir-3 |         mkdir -p path/to/dir-3 | ||||||
|  |         mkdir -p symlink/ | ||||||
|         echo "Lorem ipsum dolor sit amet" > path/to/dir-1/file1.txt |         echo "Lorem ipsum dolor sit amet" > path/to/dir-1/file1.txt | ||||||
|         echo "Hello world from file #2" > path/to/dir-2/file2.txt |         echo "Hello world from file #2" > path/to/dir-2/file2.txt | ||||||
|  |         echo "Hello from a symlinked file" > symlink/original.txt | ||||||
|  |         ln -s $(pwd)/symlink/original.txt symlink/file.txt | ||||||
|  |       shell: bash | ||||||
| 
 | 
 | ||||||
|     # Upload a single file artifact |     # Upload a single file artifact | ||||||
|     - name: 'Upload artifact #1' |     - name: 'Upload artifact #1' | ||||||
| @ -79,6 +83,12 @@ jobs: | |||||||
|           path/to/dir-[23]/* |           path/to/dir-[23]/* | ||||||
|           !path/to/dir-3/*.txt |           !path/to/dir-3/*.txt | ||||||
| 
 | 
 | ||||||
|  |     - name: 'Upload symlinked artifact' | ||||||
|  |       uses: ./ | ||||||
|  |       with: | ||||||
|  |         name: 'Symlinked-Artifact-${{ matrix.runs-on }}' | ||||||
|  |         path: symlink/file.txt | ||||||
|  | 
 | ||||||
|     # Download Artifact #1 and verify the correctness of the content |     # Download Artifact #1 and verify the correctness of the content | ||||||
|     - name: 'Download artifact #1' |     - name: 'Download artifact #1' | ||||||
|       uses: actions/download-artifact@v4 |       uses: actions/download-artifact@v4 | ||||||
| @ -141,6 +151,25 @@ jobs: | |||||||
|         } |         } | ||||||
|       shell: pwsh |       shell: pwsh | ||||||
| 
 | 
 | ||||||
|  |     - name: 'Download symlinked artifact' | ||||||
|  |       uses: actions/download-artifact@v4 | ||||||
|  |       with: | ||||||
|  |         name: 'Symlinked-Artifact-${{ matrix.runs-on }}' | ||||||
|  |         path: from/symlink | ||||||
|  | 
 | ||||||
|  |     - name: 'Verify symlinked artifact' | ||||||
|  |       run: | | ||||||
|  |         $file = "from/symlink/file.txt" | ||||||
|  |         if(!(Test-Path -path $file)) | ||||||
|  |         { | ||||||
|  |             Write-Error "Expected file does not exist" | ||||||
|  |         } | ||||||
|  |         if(!((Get-Content $file) -ceq "Hello from a symlinked file")) | ||||||
|  |         { | ||||||
|  |             Write-Error "File contents of downloaded artifact are incorrect" | ||||||
|  |         } | ||||||
|  |       shell: pwsh | ||||||
|  | 
 | ||||||
|     - name: 'Alter file 1 content' |     - name: 'Alter file 1 content' | ||||||
|       run: | |       run: | | ||||||
|         echo "This file has changed" > path/to/dir-1/file1.txt |         echo "This file has changed" > path/to/dir-1/file1.txt | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								.licenses/npm/@actions/artifact.dep.yml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								.licenses/npm/@actions/artifact.dep.yml
									
									
									
										generated
									
									
									
								
							| @ -1,6 +1,6 @@ | |||||||
| --- | --- | ||||||
| name: "@actions/artifact" | name: "@actions/artifact" | ||||||
| version: 2.1.8 | version: 2.1.10 | ||||||
| type: npm | type: npm | ||||||
| summary:  | summary:  | ||||||
| homepage:  | homepage:  | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								.licenses/npm/@actions/core.dep.yml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								.licenses/npm/@actions/core.dep.yml
									
									
									
										generated
									
									
									
								
							| @ -1,6 +1,6 @@ | |||||||
| --- | --- | ||||||
| name: "@actions/core" | name: "@actions/core" | ||||||
| version: 1.10.1 | version: 1.11.1 | ||||||
| type: npm | type: npm | ||||||
| summary:  | summary:  | ||||||
| homepage:  | homepage:  | ||||||
|  | |||||||
							
								
								
									
										1547
									
								
								dist/merge/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1547
									
								
								dist/merge/index.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										1547
									
								
								dist/upload/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1547
									
								
								dist/upload/index.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										102
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										102
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -1,16 +1,16 @@ | |||||||
| { | { | ||||||
|   "name": "upload-artifact", |   "name": "upload-artifact", | ||||||
|   "version": "4.4.0", |   "version": "4.4.1", | ||||||
|   "lockfileVersion": 2, |   "lockfileVersion": 2, | ||||||
|   "requires": true, |   "requires": true, | ||||||
|   "packages": { |   "packages": { | ||||||
|     "": { |     "": { | ||||||
|       "name": "upload-artifact", |       "name": "upload-artifact", | ||||||
|       "version": "4.4.0", |       "version": "4.4.1", | ||||||
|       "license": "MIT", |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "@actions/artifact": "2.1.8", |         "@actions/artifact": "^2.1.10", | ||||||
|         "@actions/core": "^1.10.1", |         "@actions/core": "^1.11.1", | ||||||
|         "@actions/github": "^6.0.0", |         "@actions/github": "^6.0.0", | ||||||
|         "@actions/glob": "^0.5.0", |         "@actions/glob": "^0.5.0", | ||||||
|         "@actions/io": "^1.1.2", |         "@actions/io": "^1.1.2", | ||||||
| @ -34,9 +34,10 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/@actions/artifact": { |     "node_modules/@actions/artifact": { | ||||||
|       "version": "2.1.8", |       "version": "2.1.10", | ||||||
|       "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.1.8.tgz", |       "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.1.10.tgz", | ||||||
|       "integrity": "sha512-kxgbllgF5f6mEdMeSW6WXlUbV1U77V9ECpA7LOYaY+Tm6RfXOm36EdXbpm+T9VPeaVqXK4QHLAgqay9GSyClgw==", |       "integrity": "sha512-3c6DP+ZiTgHuXYaNO3W0MnoK//ZfBnJEam1SpOZuR2epNWO7m8Wh72IdhiKMib4DMyNNt8924TOUaR2X4cRPHQ==", | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "@actions/core": "^1.10.0", |         "@actions/core": "^1.10.0", | ||||||
|         "@actions/github": "^5.1.1", |         "@actions/github": "^5.1.1", | ||||||
| @ -66,12 +67,22 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/@actions/core": { |     "node_modules/@actions/core": { | ||||||
|       "version": "1.10.1", |       "version": "1.11.1", | ||||||
|       "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz", |       "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz", | ||||||
|       "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==", |       "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==", | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "@actions/http-client": "^2.0.1", |         "@actions/exec": "^1.1.1", | ||||||
|         "uuid": "^8.3.2" |         "@actions/http-client": "^2.0.1" | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "node_modules/@actions/exec": { | ||||||
|  |       "version": "1.1.1", | ||||||
|  |       "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz", | ||||||
|  |       "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==", | ||||||
|  |       "license": "MIT", | ||||||
|  |       "dependencies": { | ||||||
|  |         "@actions/io": "^1.0.1" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/@actions/github": { |     "node_modules/@actions/github": { | ||||||
| @ -6101,12 +6112,13 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/micromatch": { |     "node_modules/micromatch": { | ||||||
|       "version": "4.0.5", |       "version": "4.0.8", | ||||||
|       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", |       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", | ||||||
|       "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", |       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "braces": "^3.0.2", |         "braces": "^3.0.3", | ||||||
|         "picomatch": "^2.3.1" |         "picomatch": "^2.3.1" | ||||||
|       }, |       }, | ||||||
|       "engines": { |       "engines": { | ||||||
| @ -6463,9 +6475,10 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "node_modules/path-to-regexp": { |     "node_modules/path-to-regexp": { | ||||||
|       "version": "6.2.1", |       "version": "6.3.0", | ||||||
|       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", |       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", | ||||||
|       "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==" |       "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", | ||||||
|  |       "license": "MIT" | ||||||
|     }, |     }, | ||||||
|     "node_modules/path-type": { |     "node_modules/path-type": { | ||||||
|       "version": "4.0.0", |       "version": "4.0.0", | ||||||
| @ -7600,9 +7613,10 @@ | |||||||
|       "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==" |       "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==" | ||||||
|     }, |     }, | ||||||
|     "node_modules/unzip-stream": { |     "node_modules/unzip-stream": { | ||||||
|       "version": "0.3.1", |       "version": "0.3.4", | ||||||
|       "resolved": "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.1.tgz", |       "resolved": "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.4.tgz", | ||||||
|       "integrity": "sha512-RzaGXLNt+CW+T41h1zl6pGz3EaeVhYlK+rdAap+7DxW5kqsqePO8kRtWPaCiVqdhZc86EctSPVYNix30YOMzmw==", |       "integrity": "sha512-PyofABPVv+d7fL7GOpusx7eRT9YETY2X04PhwbSipdj6bMxVCFJrr+nm0Mxqbf9hUiTin/UsnuFWBXlDZFy0Cw==", | ||||||
|  |       "license": "MIT", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "binary": "^0.3.0", |         "binary": "^0.3.0", | ||||||
|         "mkdirp": "^0.5.1" |         "mkdirp": "^0.5.1" | ||||||
| @ -7902,9 +7916,9 @@ | |||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@actions/artifact": { |     "@actions/artifact": { | ||||||
|       "version": "2.1.8", |       "version": "2.1.10", | ||||||
|       "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.1.8.tgz", |       "resolved": "https://registry.npmjs.org/@actions/artifact/-/artifact-2.1.10.tgz", | ||||||
|       "integrity": "sha512-kxgbllgF5f6mEdMeSW6WXlUbV1U77V9ECpA7LOYaY+Tm6RfXOm36EdXbpm+T9VPeaVqXK4QHLAgqay9GSyClgw==", |       "integrity": "sha512-3c6DP+ZiTgHuXYaNO3W0MnoK//ZfBnJEam1SpOZuR2epNWO7m8Wh72IdhiKMib4DMyNNt8924TOUaR2X4cRPHQ==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@actions/core": "^1.10.0", |         "@actions/core": "^1.10.0", | ||||||
|         "@actions/github": "^5.1.1", |         "@actions/github": "^5.1.1", | ||||||
| @ -7936,12 +7950,20 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@actions/core": { |     "@actions/core": { | ||||||
|       "version": "1.10.1", |       "version": "1.11.1", | ||||||
|       "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz", |       "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz", | ||||||
|       "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==", |       "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "@actions/http-client": "^2.0.1", |         "@actions/exec": "^1.1.1", | ||||||
|         "uuid": "^8.3.2" |         "@actions/http-client": "^2.0.1" | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "@actions/exec": { | ||||||
|  |       "version": "1.1.1", | ||||||
|  |       "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz", | ||||||
|  |       "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==", | ||||||
|  |       "requires": { | ||||||
|  |         "@actions/io": "^1.0.1" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@actions/github": { |     "@actions/github": { | ||||||
| @ -12562,12 +12584,12 @@ | |||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "micromatch": { |     "micromatch": { | ||||||
|       "version": "4.0.5", |       "version": "4.0.8", | ||||||
|       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", |       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", | ||||||
|       "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", |       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", | ||||||
|       "dev": true, |       "dev": true, | ||||||
|       "requires": { |       "requires": { | ||||||
|         "braces": "^3.0.2", |         "braces": "^3.0.3", | ||||||
|         "picomatch": "^2.3.1" |         "picomatch": "^2.3.1" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
| @ -12822,9 +12844,9 @@ | |||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "path-to-regexp": { |     "path-to-regexp": { | ||||||
|       "version": "6.2.1", |       "version": "6.3.0", | ||||||
|       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", |       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", | ||||||
|       "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==" |       "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==" | ||||||
|     }, |     }, | ||||||
|     "path-type": { |     "path-type": { | ||||||
|       "version": "4.0.0", |       "version": "4.0.0", | ||||||
| @ -13651,9 +13673,9 @@ | |||||||
|       "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==" |       "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==" | ||||||
|     }, |     }, | ||||||
|     "unzip-stream": { |     "unzip-stream": { | ||||||
|       "version": "0.3.1", |       "version": "0.3.4", | ||||||
|       "resolved": "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.1.tgz", |       "resolved": "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.4.tgz", | ||||||
|       "integrity": "sha512-RzaGXLNt+CW+T41h1zl6pGz3EaeVhYlK+rdAap+7DxW5kqsqePO8kRtWPaCiVqdhZc86EctSPVYNix30YOMzmw==", |       "integrity": "sha512-PyofABPVv+d7fL7GOpusx7eRT9YETY2X04PhwbSipdj6bMxVCFJrr+nm0Mxqbf9hUiTin/UsnuFWBXlDZFy0Cw==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "binary": "^0.3.0", |         "binary": "^0.3.0", | ||||||
|         "mkdirp": "^0.5.1" |         "mkdirp": "^0.5.1" | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|   "name": "upload-artifact", |   "name": "upload-artifact", | ||||||
|   "version": "4.4.0", |   "version": "4.4.1", | ||||||
|   "description": "Upload an Actions Artifact in a workflow run", |   "description": "Upload an Actions Artifact in a workflow run", | ||||||
|   "main": "dist/upload/index.js", |   "main": "dist/upload/index.js", | ||||||
|   "scripts": { |   "scripts": { | ||||||
| @ -29,8 +29,8 @@ | |||||||
|   }, |   }, | ||||||
|   "homepage": "https://github.com/actions/upload-artifact#readme", |   "homepage": "https://github.com/actions/upload-artifact#readme", | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@actions/artifact": "2.1.8", |     "@actions/artifact": "^2.1.10", | ||||||
|     "@actions/core": "^1.10.1", |     "@actions/core": "^1.11.1", | ||||||
|     "@actions/github": "^6.0.0", |     "@actions/github": "^6.0.0", | ||||||
|     "@actions/glob": "^0.5.0", |     "@actions/glob": "^0.5.0", | ||||||
|     "@actions/io": "^1.1.2", |     "@actions/io": "^1.1.2", | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user