Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix relative path zipping #29

Merged
merged 4 commits into from
Jul 6, 2024
Merged

Fix relative path zipping #29

merged 4 commits into from
Jul 6, 2024

Conversation

finestructure
Copy link
Member

@finestructure finestructure commented Jul 6, 2024 •
edited
Loading

Addresses relative path zipping mentioned in SwiftPackageIndex/SwiftPackageIndex-Server#3137 (comment)

@cla-bot cla-bot bot added the cla-signed label Jul 6, 2024
@finestructure finestructure requested a review from daveverwer July 6, 2024 11:31
@finestructure
Copy link
Member Author

GH still failing with weird error, doesn't seem to be our issue. Tests pass locally on both macOS and Linux.

@finestructure
Copy link
Member Author 

❯ docker run --rm -v "$PWD":/host -w /host swift:5.10.0-amazonlinux2 swift test

warning: 'host': dependency 'swift-crypto' is not used by any target
[0/1] Planning build
[1/1] Compiling plugin AWSLambdaPackager
Building for debugging...
[1/5] Write sources
[2/5] Write swift-version-24593BA9C3E375BF.txt
[4/7] Compiling DocUploader Version.swift
[5/8] Emitting module DocUploader
[6/8] Compiling DocUploader DocUploader.swift
[7/18] Wrapping AST for DocUploader for debugging
[9/22] Compiling Executable main.swift
[10/22] Emitting module Executable
[11/23] Emitting module DocUploaderTests
[12/23] Compiling DocUploaderTests DocUploaderTests.swift
[14/23] Write Objects.LinkFileList
[16/18] Linking doc-uploader
[17/18] Linking DocUploaderPackageTests.xctest
Build complete! (9.31s)
Test Suite 'All tests' started at 2024-07-06 11:37:25.906
Test Suite 'debug.xctest' started at 2024-07-06 11:37:25.907
Test Suite 'DocUploadBundleTests' started at 2024-07-06 11:37:25.907
Test Case 'DocUploadBundleTests.test_String_pathEncoded' started at 2024-07-06 11:37:25.907
Test Case 'DocUploadBundleTests.test_String_pathEncoded' passed (0.001 seconds)
Test Case 'DocUploadBundleTests.test_init' started at 2024-07-06 11:37:25.907
Test Case 'DocUploadBundleTests.test_init' passed (0.001 seconds)
Test Case 'DocUploadBundleTests.test_issue_10' started at 2024-07-06 11:37:25.908
Test Case 'DocUploadBundleTests.test_issue_10' passed (0.0 seconds)
Test Suite 'DocUploadBundleTests' passed at 2024-07-06 11:37:25.909
Executed 3 tests, with 0 failures (0 unexpected) in 0.002 (0.002) seconds
Test Suite 'ZipTests' started at 2024-07-06 11:37:25.909
Test Case 'ZipTests.test_unzip' started at 2024-07-06 11:37:25.909
Test Case 'ZipTests.test_unzip' passed (0.002 seconds)
Test Case 'ZipTests.test_zip_roundtrip' started at 2024-07-06 11:37:25.911
Test Case 'ZipTests.test_zip_roundtrip' passed (0.005 seconds)
Test Case 'ZipTests.test_zip_roundtrip_shellTool' started at 2024-07-06 11:37:25.916
/host/Tests/DocUploadBundleTests/ZipTests.swift:92: ZipTests.test_zip_roundtrip_shellTool : Test skipped: required true value but got false
Test Case 'ZipTests.test_zip_roundtrip_shellTool' skipped (0.0 seconds)
Test Case 'ZipTests.test_zip_roundtrip_shellTool_relative_paths' started at 2024-07-06 11:37:25.916
/host/Tests/DocUploadBundleTests/ZipTests.swift:143: ZipTests.test_zip_roundtrip_shellTool_relative_paths : Test skipped: required true value but got false
Test Case 'ZipTests.test_zip_roundtrip_shellTool_relative_paths' skipped (0.0 seconds)
Test Suite 'ZipTests' passed at 2024-07-06 11:37:25.916
         Executed 4 tests, with 2 tests skipped and 0 failures (0 unexpected) in 0.007 (0.007) seconds
Test Suite 'DocUploaderTests' started at 2024-07-06 11:37:25.916
Test Case 'DocUploaderTests.test_logUrl' started at 2024-07-06 11:37:25.916
Test Case 'DocUploaderTests.test_logUrl' passed (0.0 seconds)
Test Case 'DocUploaderTests.test_reportResult' started at 2024-07-06 11:37:25.916
Test Case 'DocUploaderTests.test_reportResult' passed (0.014 seconds)
Test Suite 'DocUploaderTests' passed at 2024-07-06 11:37:25.930
         Executed 2 tests, with 0 failures (0 unexpected) in 0.014 (0.014) seconds
Test Suite 'debug.xctest' passed at 2024-07-06 11:37:25.930
Executed 9 tests, with 2 tests skipped and 0 failures (0 unexpected) in 0.023 (0.023) seconds
Test Suite 'All tests' passed at 2024-07-06 11:37:25.930
Executed 9 tests, with 2 tests skipped and 0 failures (0 unexpected) in 0.023 (0.023) seconds

✦ ❯ swift test
warning: 'spi-doc-uploader': dependency 'swift-crypto' is not used by any target
Building for debugging...
[31/31] Applying doc-uploader
Build complete! (18.75s)
Test Suite 'All tests' started at 2024-07-06 13:38:17.682.
Test Suite 'DocUploaderPackageTests.xctest' started at 2024-07-06 13:38:17.682.
Test Suite 'DocUploadBundleTests' started at 2024-07-06 13:38:17.682.
Test Case '-[DocUploadBundleTests.DocUploadBundleTests test_init]' started.
Test Case '-[DocUploadBundleTests.DocUploadBundleTests test_init]' passed (0.001 seconds).
Test Case '-[DocUploadBundleTests.DocUploadBundleTests test_issue_10]' started.
Test Case '-[DocUploadBundleTests.DocUploadBundleTests test_issue_10]' passed (0.000 seconds).
Test Case '-[DocUploadBundleTests.DocUploadBundleTests test_String_pathEncoded]' started.
Test Case '-[DocUploadBundleTests.DocUploadBundleTests test_String_pathEncoded]' passed (0.000 seconds).
Test Suite 'DocUploadBundleTests' passed at 2024-07-06 13:38:17.684.
	 Executed 3 tests, with 0 failures (0 unexpected) in 0.001 (0.001) seconds
Test Suite 'DocUploaderTests' started at 2024-07-06 13:38:17.684.
Test Case '-[DocUploaderTests.DocUploaderTests test_logUrl]' started.
Test Case '-[DocUploaderTests.DocUploaderTests test_logUrl]' passed (0.000 seconds).
Test Case '-[DocUploaderTests.DocUploaderTests test_reportResult]' started.
Test Case '-[DocUploaderTests.DocUploaderTests test_reportResult]' passed (0.003 seconds).
Test Suite 'DocUploaderTests' passed at 2024-07-06 13:38:17.687.
	 Executed 2 tests, with 0 failures (0 unexpected) in 0.003 (0.003) seconds
Test Suite 'ZipTests' started at 2024-07-06 13:38:17.687.
Test Case '-[DocUploadBundleTests.ZipTests test_unzip]' started.
Test Case '-[DocUploadBundleTests.ZipTests test_unzip]' passed (0.003 seconds).
Test Case '-[DocUploadBundleTests.ZipTests test_zip_roundtrip_shellTool_relative_paths]' started.
Test Case '-[DocUploadBundleTests.ZipTests test_zip_roundtrip_shellTool_relative_paths]' passed (0.006 seconds).
Test Case '-[DocUploadBundleTests.ZipTests test_zip_roundtrip_shellTool]' started.
Test Case '-[DocUploadBundleTests.ZipTests test_zip_roundtrip_shellTool]' passed (0.005 seconds).
Test Case '-[DocUploadBundleTests.ZipTests test_zip_roundtrip]' started.
Test Case '-[DocUploadBundleTests.ZipTests test_zip_roundtrip]' passed (0.003 seconds).
Test Suite 'ZipTests' passed at 2024-07-06 13:38:17.704.
	 Executed 4 tests, with 0 failures (0 unexpected) in 0.017 (0.017) seconds
Test Suite 'DocUploaderPackageTests.xctest' passed at 2024-07-06 13:38:17.704.
	 Executed 9 tests, with 0 failures (0 unexpected) in 0.021 (0.021) seconds
Test Suite 'All tests' passed at 2024-07-06 13:38:17.704.
	 Executed 9 tests, with 0 failures (0 unexpected) in 0.021 (0.022) seconds

@finestructure
Copy link
Member Author

Self-merging so I can test this in the builder and hopefully wrap this up.

@finestructure finestructure merged commit 717b3ce into main Jul 6, 2024
1 of 2 checks passed
@finestructure finestructure deleted the fix-relative-path-zipping branch July 6, 2024 11:39
finestructure added a commit that referenced this pull request Jul 10, 2024
@finestructure
Revert "Merge pull request #29 from SwiftPackageIndex/fix-relative-pa…
74d5c67 
…th-zipping"

This reverts commit 717b3ce, reversing
changes made to 5edeb1e.
finestructure added a commit that referenced this pull request Jul 11, 2024
@finestructure
Revert "Merge pull request #29 from SwiftPackageIndex/fix-relative-pa…
9cb9357 
…th-zipping"

This reverts commit 717b3ce, reversing
changes made to 5edeb1e.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daveverwer daveverwer Awaiting requested review from daveverwer

Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@finestructure