Mirrowel commited on
Commit
d6a1c5f
·
1 Parent(s): 6faacba

ci: this time for sure xdd x4

Browse files
Files changed (1) hide show
  1. .github/workflows/pr-review.yml +50 -3
.github/workflows/pr-review.yml CHANGED
@@ -126,6 +126,11 @@ jobs:
126
  diffHunk
127
  isMinimized
128
  minimizedReason
 
 
 
 
 
129
  }
130
  }
131
  }
@@ -226,10 +231,16 @@ jobs:
226
  review_comment_filter_err=$(mktemp 2>/dev/null || echo "/tmp/review_comment_filter_err.log")
227
  if review_comments=$(echo "$discussion_data" | jq -r --argjson ignored "$IGNORE_BOT_NAMES_JSON" '
228
  ((.data.repository.pullRequest.reviewThreads.nodes // [])
229
- | map(select(.isResolved != true and .isOutdated != true))
 
 
 
 
230
  | map(.comments.nodes // [])
231
  | flatten
232
- | map(select((.isMinimized != true) and (((.author.login? // "unknown") as $login | $ignored | index($login)) | not))))
 
 
233
  | if length > 0 then
234
  map("- " + (.author.login? // "unknown") + " at " + (.createdAt // "N/A") + " (" + (.path // "Unknown file") + ":" + ((.line // .originalLine // "N/A") | tostring) + "):\n " + ((.body // "") | tostring) + "\n")
235
  | join("")
@@ -258,9 +269,15 @@ jobs:
258
  fi
259
  review_comments=$(echo "$discussion_data" | jq -r --argjson ignored "$IGNORE_BOT_NAMES_JSON" '
260
  ((.data.repository.pullRequest.reviewThreads.nodes // [])
 
 
 
 
261
  | map(.comments.nodes // [])
262
  | flatten
263
- | map(select(((.author.login? // "unknown") as $login | $ignored | index($login)) | not)))
 
 
264
  | if length > 0 then
265
  map("- " + (.author.login? // "unknown") + " at " + (.createdAt // "N/A") + " (" + (.path // "Unknown file") + ":" + ((.line // .originalLine // "N/A") | tostring) + "):\n " + ((.body // "") | tostring) + "\n")
266
  | join("")
@@ -571,6 +588,36 @@ jobs:
571
  echo "::warning::OpenCode config not found at $CONFIG_PATH; skipping instructions patch."
572
  fi
573
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
574
 
575
  - name: Assemble Review Prompt
576
  env:
 
126
  diffHunk
127
  isMinimized
128
  minimizedReason
129
+ pullRequestReview {
130
+ databaseId
131
+ isMinimized
132
+ minimizedReason
133
+ }
134
  }
135
  }
136
  }
 
231
  review_comment_filter_err=$(mktemp 2>/dev/null || echo "/tmp/review_comment_filter_err.log")
232
  if review_comments=$(echo "$discussion_data" | jq -r --argjson ignored "$IGNORE_BOT_NAMES_JSON" '
233
  ((.data.repository.pullRequest.reviewThreads.nodes // [])
234
+ | map(select(
235
+ .isResolved != true and .isOutdated != true
236
+ and (((.comments.nodes // []) | first | .isMinimized) != true)
237
+ and ((((.comments.nodes // []) | first | .pullRequestReview.isMinimized) // false) != true)
238
+ ))
239
  | map(.comments.nodes // [])
240
  | flatten
241
+ | map(select((.isMinimized != true)
242
+ and ((.pullRequestReview.isMinimized // false) != true)
243
+ and (((.author.login? // "unknown") as $login | $ignored | index($login)) | not))))
244
  | if length > 0 then
245
  map("- " + (.author.login? // "unknown") + " at " + (.createdAt // "N/A") + " (" + (.path // "Unknown file") + ":" + ((.line // .originalLine // "N/A") | tostring) + "):\n " + ((.body // "") | tostring) + "\n")
246
  | join("")
 
269
  fi
270
  review_comments=$(echo "$discussion_data" | jq -r --argjson ignored "$IGNORE_BOT_NAMES_JSON" '
271
  ((.data.repository.pullRequest.reviewThreads.nodes // [])
272
+ | map(select(
273
+ (((.comments.nodes // []) | first | .isMinimized) != true)
274
+ and ((((.comments.nodes // []) | first | .pullRequestReview.isMinimized) // false) != true)
275
+ ))
276
  | map(.comments.nodes // [])
277
  | flatten
278
+ | map(select((.isMinimized != true)
279
+ and ((.pullRequestReview.isMinimized // false) != true)
280
+ and (((.author.login? // "unknown") as $login | $ignored | index($login)) | not))))
281
  | if length > 0 then
282
  map("- " + (.author.login? // "unknown") + " at " + (.createdAt // "N/A") + " (" + (.path // "Unknown file") + ":" + ((.line // .originalLine // "N/A") | tostring) + "):\n " + ((.body // "") | tostring) + "\n")
283
  | join("")
 
588
  echo "::warning::OpenCode config not found at $CONFIG_PATH; skipping instructions patch."
589
  fi
590
 
591
+ - name: Copy Instruction Files to Workspace and Log Locations (TEMP verify)
592
+ run: |
593
+ set -e
594
+ CONFIG_PATH="$HOME/.config/opencode/opencode.json"
595
+ SRC_DIR="$HOME/.config/opencode"
596
+ DST_DIR="$GITHUB_WORKSPACE"
597
+ echo "CONFIG_PATH=$CONFIG_PATH"
598
+ echo "SRC_DIR=$SRC_DIR"
599
+ echo "DST_DIR=$DST_DIR"
600
+ mkdir -p "$DST_DIR"
601
+ # Copy instruction files to workspace root so opencode can resolve bare filenames
602
+ cp "$SRC_DIR/pr-context.txt" "$DST_DIR/pr-context.txt" || true
603
+ cp "$SRC_DIR/pr-diff.txt" "$DST_DIR/pr-diff.txt" || true
604
+ # Log exact locations for verification
605
+ echo "-- Source instruction files --"
606
+ ls -l "$SRC_DIR"/pr-*.txt || true
607
+ echo "-- Workspace instruction files --"
608
+ ls -l "$DST_DIR"/pr-*.txt || true
609
+ echo "-- Config file --"
610
+ ls -l "$CONFIG_PATH" || true
611
+ echo "-- Absolute paths --"
612
+ (command -v realpath >/dev/null 2>&1 && {
613
+ echo "Workspace pr-context: $(realpath "$DST_DIR/pr-context.txt" 2>/dev/null || true)";
614
+ echo "Workspace pr-diff: $(realpath "$DST_DIR/pr-diff.txt" 2>/dev/null || true)";
615
+ echo "Config path: $(realpath "$CONFIG_PATH" 2>/dev/null || true)";
616
+ echo "Source pr-context: $(realpath "$SRC_DIR/pr-context.txt" 2>/dev/null || true)";
617
+ echo "Source pr-diff: $(realpath "$SRC_DIR/pr-diff.txt" 2>/dev/null || true)";
618
+ }) || true
619
+ echo "PWD=$(pwd)"
620
+
621
 
622
  - name: Assemble Review Prompt
623
  env: