fix: update URLs APIs to work with linux (#103)

ajkolean · fortmarek · web-flow · commit cec4ae2b1c1a · 2025-02-04T19:12:39.000+01:00
* fix: Update URLs APIs to work with linux

* [gh actions] restore linux jobs

* Fix Linux build

* Fix obtaining path on Linux

---------

Co-authored-by: fortmarek &lt;marekfort@me.com&gt;
diff --git a/.github/workflows/file-system.yml b/.github/workflows/file-system.yml
@@ -3,7 +3,7 @@ name: FileSystem
 on:
   push:
     branches:
-      - main
+    - main
   pull_request: {}
 
 env:
@@ -18,63 +18,85 @@ jobs:
     name: "Release build on macOS 14"
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
-      - uses: jdx/mise-action@v2
-        with:
-          experimental: true
-      - name: Run
-        run: mise run build-spm
+    - uses: actions/checkout@v4
+    - uses: jdx/mise-action@v2
+      with:
+        experimental: true
+    - name: Run
+      run: mise run build-spm
+
+  build-linux:
+    name: "Release build on Linux"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: jdx/mise-action@v2
+      with:
+        experimental: true
+    - name: Run
+      run: mise run build-linux
 
   build_tuist:
     name: "Tuist build"
     runs-on: "macos-14"
     steps:
-      - uses: actions/checkout@v4
-      - name: Select Xcode
-        run: sudo xcode-select -switch /Applications/Xcode_$(cat .xcode-version).app
-      - uses: jdx/mise-action@v2
-        with:
-          experimental: true
-      - name: Run
-        run: |
-          mise x -- tuist install
-          mise run build
+    - uses: actions/checkout@v4
+    - name: Select Xcode
+      run: sudo xcode-select -switch /Applications/Xcode_$(cat .xcode-version).app
+    - uses: jdx/mise-action@v2
+      with:
+        experimental: true
+    - name: Run
+      run: |
+        mise x -- tuist install
+        mise run build
 
   test:
     name: "Test on macOS 14"
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
-      - uses: jdx/mise-action@v2
-        with:
-          experimental: true
-      - name: Run
-        run: mise run test-spm
+    - uses: actions/checkout@v4
+    - uses: jdx/mise-action@v2
+      with:
+        experimental: true
+    - name: Run
+      run: mise run test-spm
+
+  test_linux:
+    name: "Test on Linux"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: jdx/mise-action@v2
+      with:
+        experimental: true
+    - name: Run
+      run: mise run test-linux
 
   test_tuist:
     name: "Tuist test"
     runs-on: "macos-14"
     env:
       TUIST_CONFIG_CLOUD_TOKEN: ${{ secrets.TUIST_CONFIG_CLOUD_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Select Xcode
-        run: sudo xcode-select -switch /Applications/Xcode_$(cat .xcode-version).app
-      - uses: jdx/mise-action@v2
-        with:
-          experimental: true
-      - name: Run
-        run: |
-          mise x -- tuist install
-          mise run test
+    - uses: actions/checkout@v4
+    - name: Select Xcode
+      run: sudo xcode-select -switch /Applications/Xcode_$(cat .xcode-version).app
+    - uses: jdx/mise-action@v2
+      with:
+        experimental: true
+    - name: Run
+      run: |
+        mise x -- tuist install
+        mise run test
 
   lint:
     name: Lint
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
-      - uses: jdx/mise-action@v2
-        with:
-          experimental: true
-      - name: Run
-        run: mise run lint
+    - uses: actions/checkout@v4
+    - uses: jdx/mise-action@v2
+      with:
+        experimental: true
+    - name: Run
+      run: mise run lint
diff --git a/.mise/tasks/build-linux b/.mise/tasks/build-linux
@@ -12,6 +12,6 @@ fi
 $CONTAINER_RUNTIME run --rm \
     --volume "$MISE_PROJECT_ROOT:/package" \
     --workdir "/package" \
-    swift:5.9.2 \
+    swift:6.0.3 \
     /bin/bash -c \
-    "swift build --configuration release --build-path ./.build/linux"
+    "swift build --configuration release --build-path ./.build/linux"
diff --git a/.mise/tasks/test-linux b/.mise/tasks/test-linux
@@ -12,6 +12,6 @@ fi
 $CONTAINER_RUNTIME run --rm \
     --volume "$MISE_PROJECT_ROOT:/package" \
     --workdir "/package" \
-    swift:5.9.2 \
+    swift:6.0.3 \
     /bin/bash -c \
-    "swift test"
+    "swift test"
diff --git a/Package.resolved b/Package.resolved
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio",
       "state" : {
-        "revision" : "dca6594f65308c761a9c409e09fbf35f48d50d34",
-        "version" : "2.77.0"
+        "revision" : "ba72f31e11275fc5bf060c966cf6c1f36842a291",
+        "version" : "2.79.0"
       }
     },
     {
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/weichsel/ZIPFoundation",
       "state" : {
-        "revision" : "02b6abe5f6eef7e3cbd5f247c5cc24e246efcfe0",
-        "version" : "0.9.19"
+        "branch" : "development",
+        "revision" : "e9b1917bd4d7d050e0ff4ec157b5d6e253c84385"
       }
     }
   ],
diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
     name: "FileSystem",
     platforms: [
         .macOS("13.0"),
-        .iOS("13.0"),
+        .iOS("16.0"),
     ],
     products: [
         .library(
@@ -28,7 +28,7 @@ let package = Package(
         .package(url: "https://github.com/tuist/Path", .upToNextMajor(from: "0.3.8")),
         .package(url: "https://github.com/apple/swift-nio", .upToNextMajor(from: "2.79.0")),
         .package(url: "https://github.com/apple/swift-log", .upToNextMajor(from: "1.6.2")),
-        .package(url: "https://github.com/weichsel/ZIPFoundation", .upToNextMajor(from: "0.9.19")),
+        .package(url: "https://github.com/weichsel/ZIPFoundation", branch: "development"),
     ],
     targets: [
         .target(
diff --git a/Sources/FileSystem/FileSystem.swift b/Sources/FileSystem/FileSystem.swift
@@ -314,9 +314,9 @@ public struct FileSystem: FileSysteming, Sendable {
 
         /// The path to the directory /var is a symlink to /var/private.
         /// NSTemporaryDirectory() returns the path to the symlink, so the logic here removes the symlink from it.
-        if systemTemporaryDirectory.starts(with: "/var/") {
-            systemTemporaryDirectory = "/private\(systemTemporaryDirectory)"
-        }
+//        if systemTemporaryDirectory.starts(with: "/var/") {
+//            systemTemporaryDirectory = "/private\(systemTemporaryDirectory)"
+//        }
         let temporaryDirectory = try AbsolutePath(validating: systemTemporaryDirectory)
             .appending(component: "\(prefix)-\(UUID().uuidString)")
         logger?.debug("Creating a temporary directory at path \(temporaryDirectory.pathString).")
diff --git a/Sources/Glob/GlobSearch.swift b/Sources/Glob/GlobSearch.swift
@@ -46,17 +46,17 @@ public func search(
                     case let .constant(constant):
                         if constant.hasSuffix("/") {
                             (
-                                baseURL.appending(path: constant.dropLast()),
+                                baseURL.appendingPath(constant.dropLast()),
                                 Pattern(sections: Array(include.sections.dropFirst()), options: include.options)
                             )
                         } else if include.sections.count == 1 {
                             (
-                                baseURL.appending(path: constant),
+                                baseURL.appendingPath(constant),
                                 Pattern(sections: Array(include.sections.dropFirst()), options: include.options)
                             )
                         } else if case .componentWildcard = include.sections[1] {
                             (
-                                baseURL.appending(path: constant.components(separatedBy: "/").dropLast().joined(separator: "/")),
+                                baseURL.appendingPath(constant.components(separatedBy: "/").dropLast().joined(separator: "/")),
                                 Pattern(
                                     sections: [.constant(constant.components(separatedBy: "/").last ?? "")] +
                                         Array(include.sections.dropFirst()),
@@ -65,7 +65,7 @@ public func search(
                             )
                         } else {
                             (
-                                baseURL.appending(path: constant),
+                                baseURL.appendingPath(constant),
                                 Pattern(sections: Array(include.sections.dropFirst()), options: include.options)
                             )
                         }
@@ -83,7 +83,7 @@ public func search(
                     }
 
                     let path = baseURL.absoluteString.removingPercentEncoding ?? baseURL.absoluteString
-                    let symbolicLinkDestination = URL(filePath: path).resolvingSymlinksInPath()
+                    let symbolicLinkDestination = URL.with(filePath: path).resolvingSymlinksInPath()
                     var isDirectory: ObjCBool = false
 
                     let symbolicLinkDestinationPath: String = symbolicLinkDestination
@@ -182,7 +182,7 @@ private func search(
 
             let matchResult = try matching(url, relativePath)
 
-            let foundPath = directory.appending(path: url.relativePath)
+            let foundPath = directory.appendingPath(url.lastPathComponent)
 
             if matchResult.matches {
                 continuation.yield(foundPath)
@@ -222,3 +222,23 @@ private func search(
         try await group.waitForAll()
     }
 }
+
+extension URL {
+    public static func with(filePath: String) -> URL {
+        #if os(Linux)
+            return URL(fileURLWithPath: filePath)
+        #else
+            return URL(filePath: filePath)
+        #endif
+    }
+
+    public func appendingPath(_ path: any StringProtocol) -> URL {
+        #if os(Linux)
+            return path
+                .split(separator: "/")
+                .reduce(self) { $0.appendingPathComponent(String($1)) }
+        #else
+            return appending(path: path)
+        #endif
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@`
`41`	`41`	`"kind" : "remoteSourceControl",`
`42`	`42`	`"location" : "https://github.com/apple/swift-nio",`
`43`	`43`	`"state" : {`
`44`		`- "revision" : "dca6594f65308c761a9c409e09fbf35f48d50d34",`
`45`		`- "version" : "2.77.0"`
	`44`	`+ "revision" : "ba72f31e11275fc5bf060c966cf6c1f36842a291",`
	`45`	`+ "version" : "2.79.0"`
`46`	`46`	`}`
`47`	`47`	`},`
`48`	`48`	`{`
`@@ -59,8 +59,8 @@`
`59`	`59`	`"kind" : "remoteSourceControl",`
`60`	`60`	`"location" : "https://github.com/weichsel/ZIPFoundation",`
`61`	`61`	`"state" : {`
`62`		`- "revision" : "02b6abe5f6eef7e3cbd5f247c5cc24e246efcfe0",`
`63`		`- "version" : "0.9.19"`
	`62`	`+ "branch" : "development",`
	`63`	`+ "revision" : "e9b1917bd4d7d050e0ff4ec157b5d6e253c84385"`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`],`
Original file line number	Diff line number	Diff line change
`@@ -46,17 +46,17 @@ public func search(`
`46`	`46`	`case let .constant(constant):`
`47`	`47`	`if constant.hasSuffix("/") {`
`48`	`48`	`(`
`49`		`- baseURL.appending(path: constant.dropLast()),`
	`49`	`+ baseURL.appendingPath(constant.dropLast()),`
`50`	`50`	`Pattern(sections: Array(include.sections.dropFirst()), options: include.options)`
`51`	`51`	`)`
`52`	`52`	`} else if include.sections.count == 1 {`
`53`	`53`	`(`
`54`		`- baseURL.appending(path: constant),`
	`54`	`+ baseURL.appendingPath(constant),`
`55`	`55`	`Pattern(sections: Array(include.sections.dropFirst()), options: include.options)`
`56`	`56`	`)`
`57`	`57`	`} else if case .componentWildcard = include.sections[1] {`
`58`	`58`	`(`
`59`		`- baseURL.appending(path: constant.components(separatedBy: "/").dropLast().joined(separator: "/")),`
	`59`	`+ baseURL.appendingPath(constant.components(separatedBy: "/").dropLast().joined(separator: "/")),`
`60`	`60`	`Pattern(`
`61`	`61`	`sections: [.constant(constant.components(separatedBy: "/").last ?? "")] +`
`62`	`62`	`Array(include.sections.dropFirst()),`
`@@ -65,7 +65,7 @@ public func search(`
`65`	`65`	`)`
`66`	`66`	`} else {`
`67`	`67`	`(`
`68`		`- baseURL.appending(path: constant),`
	`68`	`+ baseURL.appendingPath(constant),`
`69`	`69`	`Pattern(sections: Array(include.sections.dropFirst()), options: include.options)`
`70`	`70`	`)`
`71`	`71`	`}`
`@@ -83,7 +83,7 @@ public func search(`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`let path = baseURL.absoluteString.removingPercentEncoding ?? baseURL.absoluteString`
`86`		`- let symbolicLinkDestination = URL(filePath: path).resolvingSymlinksInPath()`
	`86`	`+ let symbolicLinkDestination = URL.with(filePath: path).resolvingSymlinksInPath()`
`87`	`87`	`var isDirectory: ObjCBool = false`
`88`	`88`
`89`	`89`	`let symbolicLinkDestinationPath: String = symbolicLinkDestination`
`@@ -182,7 +182,7 @@ private func search(`
`182`	`182`
`183`	`183`	`let matchResult = try matching(url, relativePath)`
`184`	`184`
`185`		`- let foundPath = directory.appending(path: url.relativePath)`
	`185`	`+ let foundPath = directory.appendingPath(url.lastPathComponent)`
`186`	`186`
`187`	`187`	`if matchResult.matches {`
`188`	`188`	`continuation.yield(foundPath)`
`@@ -222,3 +222,23 @@ private func search(`
`222`	`222`	`try await group.waitForAll()`
`223`	`223`	`}`
`224`	`224`	`}`
	`225`	`+`
	`226`	`+extension URL {`
	`227`	`+ public static func with(filePath: String) -> URL {`
	`228`	`+ #if os(Linux)`
	`229`	`+ return URL(fileURLWithPath: filePath)`
	`230`	`+ #else`
	`231`	`+ return URL(filePath: filePath)`
	`232`	`+ #endif`
	`233`	`+ }`
	`234`	`+`
	`235`	`+ public func appendingPath(_ path: any StringProtocol) -> URL {`
	`236`	`+ #if os(Linux)`
	`237`	`+ return path`
	`238`	`+ .split(separator: "/")`
	`239`	`+ .reduce(self) { $0.appendingPathComponent(String($1)) }`
	`240`	`+ #else`
	`241`	`+ return appending(path: path)`
	`242`	`+ #endif`
	`243`	`+ }`
	`244`	`+}`