Merge pull request #227 from CharlieSuP1/master

prebuild should run artifactsOrganizer.prepare(artifact:) method even  if artifacts exists locally

.github/workflows/ci.yaml

@@ -13,14 +13,16 @@ jobs:
           args: --strict
 
   macOS:
-    runs-on: macos-12
+    runs-on: macos-14
     env:
-      XCODE_VERSION: ${{ '14.2' }}
+      XCODE_VERSION: ${{ '14.3.1' }}
     steps:
       - name: Select Xcode
         run: "sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app"
       - name: Checkout
         uses: actions/checkout@v1
+      - name: Install nginx
+        run: brew install nginx
       - name: Build and Run
         run: rake build[release]
       - name: Test

.github/workflows/docs.yaml

@@ -7,9 +7,9 @@ on:
 
 jobs:
   docs:
-    runs-on: macos-12
+    runs-on: macos-14
     env:
-      XCODE_VERSION: ${{ '14.2' }}
+      XCODE_VERSION: ${{ '14.3.1' }}
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode

.github/workflows/release.yaml

@@ -6,9 +6,9 @@ on:
 jobs:
   macOS:
     name: Add macOS binaries to release
-    runs-on: macos-12
+    runs-on: macos-14
     env:
-      XCODE_VERSION: ${{ '14.2' }}
+      XCODE_VERSION: ${{ '14.3.1' }}
     steps:
       - name: Select Xcode
         run: "sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app"

README.md

@@ -7,7 +7,6 @@ _XCRemoteCache is a remote cache tool for Xcode projects. It reuses target artif
 
 [![Build Status](https://github.com/spotify/XCRemoteCache/workflows/CI/badge.svg)](https://github.com/spotify/XCRemoteCache/workflows/CI/badge.svg)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
-[![Slack](https://slackin.spotify.com/badge.svg)](https://slackin.spotify.com)
 [![Docs](https://github.com/spotify/XCRemoteCache/workflows/Docs/badge.svg)](https://spotify.github.io/XCRemoteCache/documentation/xcremotecache/)
 
 - [How and Why?](#how-and-why)
@@ -499,8 +498,6 @@ The zip package will be generated at `releases/XCRemoteCache.zip`.
 
 Create a [new issue](https://github.com/spotify/XCRemoteCache/issues/new) with as many details as possible.
 
-Reach us at the `#xcremotecache` channel in [Slack](https://slackin.spotify.com/).
-
 ## Contributing
 
 We feel that a welcoming community is important and we ask that you follow Spotify's 

Sources/XCRemoteCache/Commands/Prebuild/Prebuild.swift

@@ -91,6 +91,7 @@ class Prebuild {
             switch artifactPreparationResult {
             case .artifactExists(let artifactDir):
                 infoLog("Artifact exists locally at \(artifactDir)")
+                _ = try artifactsOrganizer.prepare(artifact: artifactDir)
                 try artifactsOrganizer.activate(extractedArtifact: artifactDir)
             case .preparedForArtifact(let artifactPackage):
                 infoLog("Downloading artifact to \(artifactPackage)")

Sources/XCRemoteCache/Shell/Shell.swift

@@ -84,13 +84,13 @@ private func shellInternal(_ cmd: String, args: [String] = [], stdout: PipeLike?
         task.currentDirectoryPath = dir
     }
     task.launch()
+    let errorData = (stderr != nil) ? nil : errorHandle.fileHandleForReading.readDataToEndOfFile()
     task.waitUntilExit()
     if task.terminationStatus != 0 {
-        if stderr != nil {
+        guard let errorData = errorData else {
             // Error stream was captured so cannot inspect its content
             throw ShellError.statusError("Failed command", task.terminationStatus)
         }
-        let errorData = errorHandle.fileHandleForReading.readDataToEndOfFile()
         let errorString = String(data: errorData, encoding: .utf8)?.trim() ?? "No error returned from the process."
         throw ShellError.statusError(
             "status \(task.terminationStatus): \(errorString)", task.terminationStatus

Sources/XCRemoteCache/Stats/CacheHitLogger.swift

@@ -37,7 +37,7 @@ class ActionSpecificCacheHitLogger: CacheHitLogger {
         case .index:
             hitCounter = .indexingTargetHitCount
             missCounter = .indexingTargetMissCount
-        case .build:
+        case .build, .archive:
             hitCounter = .targetCacheHit
             missCounter = .targetCacheMiss
         case .unknown:

Sources/XCRemoteCache/Xcode/BuildActionType.swift

@@ -25,6 +25,8 @@ enum BuildActionType: String, Codable {
     case build
     /// An extra build, exclusive for indexing (Introduced in Xcode 13)
     case index = "indexbuild"
+    /// Archive build
+    case archive = "install"
     /// Unknown type, probably incompatible Xcode version used
     case unknown
 }

Sources/xclibtoolSupport/XCLibtoolHelper.swift

@@ -47,7 +47,8 @@ public class XCLibtoolHelper {
             case "-dependency_info":
                 dependencyInfo = args[i + 1]
                 i += 1
-            case let input where args[i].starts(with: "/") && ["", "a"].contains(URL(string: args[i])?.pathExtension):
+            case let input where input.starts(with: "/") &&
+                ["", "a"].contains(URL(fileURLWithPath: input).pathExtension):
                 // Assume always absolute paths to the library
                 // Support for static frameworks (no extension) and static libraries (.a)
                 inputLibraries.append(input)

Tests/xclibtoolSupportTests/XCLibtoolHelperTests.swift

@@ -74,4 +74,15 @@ class XCLibtoolHelperTests: XCTestCase {
             inputs: ["/arch1/static", "/arch2/static"]
         ))
     }
+
+    func testRecognizesPathsWithSpaces() throws {
+        let mode = try XCLibtoolHelper.buildMode(
+            args: ["-static", "-o", "/universal/static", "/arch/with space/static"]
+        )
+
+        XCTAssertEqual(mode, .createUniversalBinary(
+            output: "/universal/static",
+            inputs: ["/arch/with space/static"]
+        ))
+    }
 }