Updated method to output the results...

... so the next step in the action can capture it.
MobilityData · Oct 23, 2024 · 9c09cc3 · 9c09cc3
1 parent 30c90e2
commit 9c09cc3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 58 deletions.
diff --git a/.github/workflows/fetch_new_commits_from_remote_repos.yaml b/.github/workflows/fetch_new_commits_from_remote_repos.yaml
@@ -24,16 +24,29 @@ jobs:
 
       - name: Run Swift Script
         id: run-swift-script
-        run: swift scripts/monitor-remote-repos-for-new-commits.swift
+        run: OUTPUT=$(swift scripts/monitor-remote-repos-for-new-commits.swift)
         env:
           GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
 
+      - name: Parse Output
+        id: parse-output
+        run: |
+          FOUND_COMMITS=$(echo "$swift_output" | jq -r '.found_commits')
+          BRANCH_NAME=$(echo "$swift_output" | jq -r '.branch_name')
+          ISSUE_TITLE=$(echo "$swift_output" | jq -r '.issue_title')
+          ISSUE_BODY=$(echo "$swift_output" | jq -r '.issue_body')
+
+          echo "found_commits=$FOUND_COMMITS" >> $GITHUB_OUTPUT
+          echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          echo "issue_title=$ISSUE_TITLE" >> $GITHUB_OUTPUT
+          echo "issue_body=$ISSUE_BODY" >> $GITHUB_OUTPUT
+
       - name: Create issue
         id: create-issue
-        # if: steps.run-swift-script.outputs.found_commits == 'true'
+        # if: steps.parse-output.outputs.found_commits == 'true'
         uses: dacbd/create-issue-action@v2.0.0
         with:
           token: ${{ env.GITHUB_TOKEN }}
           assignees: Sergiodero
-          title: ${{ steps.run-swift-script.outputs.issue_title }}
-          body: ${{ steps.run-swift-script.outputs.issue_body }}
+          title: ${{ steps.parse-output.outputs.issue_title }}
+          body: ${{ steps.parse-output.outputs.issue_body }}
diff --git a/scripts/monitor-remote-repos-for-new-commits.swift b/scripts/monitor-remote-repos-for-new-commits.swift
@@ -210,44 +210,6 @@ func fetchModifiedFiles(commitSha: String, targetRepo: String) async throws -> [
     return files.compactMap { $0["filename"] as? String }
 }
 
-/// Writes a key-value pair to the `$GITHUB_OUTPUT` environment variable to be used between steps in a GitHub Actions workflow.
-///
-/// This function takes a key and its corresponding value and writes it to `$GITHUB_OUTPUT`, which allows subsequent steps in a GitHub Actions workflow to access this output.
-///
-/// Example:
-/// ```
-/// setGitHubOutput(key: "branch_name", value: "feature-branch")
-/// ```
-///
-/// - Parameters:
-///   - key: The key to be used in the output, which will be referenced in subsequent steps.
-///   - value: The value corresponding to the key that will be stored in the output.
-func setGitHubOutput(key: String, value: String) {
-    if isInDebugMode { print("setGitHubOutput : start") }
-
-    let task: Process = Process()
-    task.executableURL = URL(fileURLWithPath: "/bin/bash")
-
-    // Pass the GITHUB_OUTPUT environment variable properly
-    if let githubOutputPath = ProcessInfo.processInfo.environment["GITHUB_OUTPUT"] {
-        let quotedValue: String = "\"\(value)\""
-        task.arguments = ["-c", "echo \(key)=\(quotedValue) >> \(githubOutputPath)"]
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-        } catch let error as NSError {
-            print("Failed to run task with error: \(error), \(error.userInfo)")
-        } catch {
-            print("Unknown error occurred: \(error)")
-        }
-    } else {
-        print("GITHUB_OUTPUT environment variable is not set")
-    }
-
-    if isInDebugMode { print("setGitHubOutput : end") }
-}
-
 // MARK: - Main
 
 /// Iterates through a list of pages to monitor, fetches recent commits for each monitored file, collects the modified files and commit URLs, and stores them for later use.
@@ -341,26 +303,26 @@ func processCommits(modifiedFiles: [String], commitUrls: [String: [String]]) {
 
             if isInDebugMode { print("issueBody : \n\n \(issueBody)") }
 
-            setGitHubOutput(key: "found_commits", value: "true")
-            setGitHubOutput(key: "branch_name", value: branchName)
-            setGitHubOutput(key: "issue_title", value: issueTitle)
-            setGitHubOutput(key: "issue_body", value: issueBody)
+            let output: [String: Any] = [
+                "found_commits": true,
+                "branch_name": branchName,
+                "issue_title": issueTitle,
+                "issue_body": issueBody
+            ]
 
-//            print("echo found_commits=true >> $GITHUB_OUTPUT")
-//            print("echo branch_name=\(branchName) >> $GITHUB_OUTPUT")
-//            print("echo issue_title=\(issueTitle) >> $GITHUB_OUTPUT")
-//            print("echo issue_body=\(issueBody) >> $GITHUB_OUTPUT")
+            if let jsonData : Data = try? JSONSerialization.data(withJSONObject: output, options: []),
+               let jsonString : String = String(data: jsonData, encoding: .utf8) { print(jsonString) }
         }
     } else {
 
-        setGitHubOutput(key: "found_commits", value: "false")
-        setGitHubOutput(key: "branch_name", value: "")
-        setGitHubOutput(key: "issue_title", value: "")
-        setGitHubOutput(key: "issue_body", value: "")
+        let output: [String: Any] = [
+            "found_commits": false,
+            "branch_name": "",
+            "issue_title": "",
+            "issue_body": ""
+        ]
 
-//        print("echo found_commits=false >> $GITHUB_OUTPUT")
-//        print("echo branch_name=\"\" >> $GITHUB_OUTPUT")
-//        print("echo issue_title=\"\" >> $GITHUB_OUTPUT")
-//        print("echo issue_body=\"\" >> $GITHUB_OUTPUT")
+        if let jsonData : Data = try? JSONSerialization.data(withJSONObject: output, options: []),
+           let jsonString : String = String(data: jsonData, encoding: .utf8) { print(jsonString) }
     }
 }