Fix caching not found, and 2 fixme marks

Author: wei18

Actions/Comment/Mintfile renamed to Actions/SetUp/Mintfile

@@ -2,23 +2,13 @@ name: SetUp
 runs:
   using: composite
   steps:
-    - name: Setup Swift
+    - name: "Setup Swift"
       uses: swift-actions/setup-swift@v2
       with:
         swift-version: 5.10.0
 
-    - name: Cache Packagge
-      uses: actions/cache@v4
-      with:
-        path: |
-          .build
-          ~/Library/Caches/org.swift.swiftpm/
-        key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-spm-
-
     - name: "Setup Mint"
       uses: irgaly/setup-mint@v1
       with:
+        mint-directory: ${{ github.action_path }}
         mint-executable-directory: "~/.mint/bin"
-

Actions/SetUp/action.yml

@@ -37,6 +37,7 @@ struct CLIYamlBuilder {
         }
 
         let name = String(describing: command)
+        let repo = "Wei18/GitHubSwiftActions"
 
         // Define the structure of the composite action
         let action: [String: Any] = [
@@ -48,12 +49,11 @@ struct CLIYamlBuilder {
                 "steps": [
                     [
                         "name": "Setup Swift, Mint, Cache, etc.",
-                        "uses": "Wei18/GitHubSwiftActions/Actions/SetUp@main",
+                        "uses": "\(repo)/Actions/SetUp@main",
                     ],
                     [
                         "name": "Run \(name)",
-                        // FIXME: owner/repo
-                        "run": "~/.mint/bin/mint run Wei18/GitHubSwiftActions@main \(name)",
+                        "run": "~/.mint/bin/mint run \(repo)@main \(name)",
                         "env": envDict,
                         "shell": "bash",
                     ],

Sources/YamlWriter/CLIYamlBuilder.swift

@@ -11,17 +11,17 @@ import ArgumentParser
 struct FileBuilder {
     let content: String
     let commandName: String
-    let basePath: String?
+    let basePath: URL
     let file: String
 
     /// Initializes the `FileBuilder` with the content to be written and the command name.
     ///
     /// - Parameters:
     ///   - content: The content (YAML) to be written to the file.
     ///   - command: The ParsableCommand type to inspect.
-    ///   - basePath: Optional path to the base directory, such as the repo's root. If `nil`, defaults to current directory.
+    ///   - basePath: The path to the base directory.
     ///   - file: Define the file path. (default: action.yml)
-    init<T: ParsableCommand>(content: String, command: T.Type, basePath: String? = nil, file: String = "action.yml") {
+    init<T: ParsableCommand>(content: String, command: T.Type, basePath: URL, file: String = "action.yml") {
         self.content = content
         self.commandName = String(describing: command)
         self.basePath = basePath
@@ -33,11 +33,10 @@ struct FileBuilder {
     /// - Returns: The path to the generated file.
     @discardableResult
     func build() throws -> String {
-        // Use the base path if provided, otherwise use the current directory
-        let rootPath = basePath ?? FileManager.default.currentDirectoryPath
-
-        // Define the path to the Actions directory
-        let actionsPath = "\(rootPath)/Actions/\(commandName)"
+        // Define the path to the action directory
+        let actionsPath = basePath
+            .appendingPathComponent(commandName)
+            .path
 
         // Create the directory structure if it doesn't exist
         try FileManager.default.createDirectory(atPath: actionsPath, withIntermediateDirectories: true)

Sources/YamlWriter/FileBuilder.swift

@@ -5,6 +5,7 @@
 //  Created by zwc on 2024/9/6.
 //
 
+import Foundation
 import ArgumentParser
 import CommentCore
 
@@ -22,22 +23,28 @@ struct YamlWriterCLI: ParsableCommand {
             command: command,
             description: "Runs the process of adding or updating a comment in a GitHub issue or pull request.")
 
-        // FIXME: basePath
         let actionPath = try FileBuilder(
             content: yaml,
             command: command,
-            basePath: "/Users/zw/Documents/GitHub/GitHubSwiftActions"
-        ).build()
-
-        try FileBuilder(
-            content: "Wei18/GitHubSwiftActions@main",
-            command: command,
-            basePath: "/Users/zw/Documents/GitHub/GitHubSwiftActions",
-            file: "Mintfile"
+            basePath: packDirectory().appendingPathComponent("Actions")
         ).build()
 
         print(actionPath)
     }
+
+    private func packDirectory(
+        for file: StaticString = #file,
+        anchorRepoPathComponent: String = "Sources"
+    ) -> URL {
+        let packDirectory: URL = {
+            var newValue = URL(fileURLWithPath: file.description, isDirectory: false)
+            while newValue.lastPathComponent != anchorRepoPathComponent {
+                newValue = newValue.deletingLastPathComponent()
+            }
+            return newValue.deletingLastPathComponent()
+        }()
+        return packDirectory
+    }
 }
 
 YamlWriterCLI.main()