mirror of
https://github.com/lifting-bits/sleigh
synced 2026-06-21 13:56:12 +00:00
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Eric Kilmer
|
db0dc4c479 | ||
|
Eric Kilmer
|
efe3b7dcbd | ||
|
Eric Kilmer
|
d4b0316955 | ||
|
Eric Kilmer
|
86f39ba60f | ||
|
dependabot[bot]
|
0dd2d21bdc | ||
|
auto-updater[bot]
|
d02e760030 | ||
|
Eric Kilmer
|
42d2ee7457 | ||
|
Eric Kilmer
|
0664b5c545 | ||
|
Eric Kilmer
|
cd6078bb22 | ||
|
Eric Kilmer
|
fc49d2340e | ||
|
auto-updater[bot]
|
1df5e051d3 | ||
|
Eric Kilmer
|
edc5fabd3a | ||
|
auto-updater[bot]
|
9316045354 | ||
|
auto-updater[bot]
|
ec98f45ecf | ||
|
dependabot[bot]
|
e4b6ddb926 | ||
|
auto-updater[bot]
|
9248e9114b | ||
|
dependabot[bot]
|
a020faccb5 | ||
|
dependabot[bot]
|
d74e8e9414 |
@@ -0,0 +1,161 @@
|
||||
name: Documentation
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
workflow_dispatch: # manual trigger
|
||||
|
||||
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
|
||||
permissions:
|
||||
contents: read
|
||||
pages: write
|
||||
id-token: write
|
||||
|
||||
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
|
||||
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
|
||||
concurrency:
|
||||
group: pages
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
environment:
|
||||
name: github-pages
|
||||
url: ${{ steps.deployment.outputs.page_url }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Setup Git User for Applying Patches
|
||||
# See this thread for more details https://github.community/t/github-actions-bot-email-address/17204/5
|
||||
run: |
|
||||
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git config --global user.name "github-actions[bot]"
|
||||
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get update && sudo apt-get install -y doxygen graphviz
|
||||
|
||||
# Build stable documentation
|
||||
- name: Configure (stable)
|
||||
run: cmake --preset=ci-ubuntu -Dsleigh_RELEASE_TYPE=stable
|
||||
|
||||
- name: Build documentation (stable)
|
||||
run: cmake --build build --target docs
|
||||
|
||||
- name: Copy stable docs
|
||||
run: |
|
||||
mkdir -p docs-site/stable
|
||||
cp -r build/docs/html/* docs-site/stable/
|
||||
|
||||
# Clean and build HEAD documentation
|
||||
- name: Clean build directory
|
||||
run: rm -rf build
|
||||
|
||||
- name: Configure (HEAD)
|
||||
run: cmake --preset=ci-ubuntu -Dsleigh_RELEASE_TYPE=HEAD
|
||||
|
||||
- name: Build documentation (HEAD)
|
||||
run: cmake --build build --target docs
|
||||
|
||||
- name: Copy HEAD docs
|
||||
run: |
|
||||
mkdir -p docs-site/HEAD
|
||||
cp -r build/docs/html/* docs-site/HEAD/
|
||||
|
||||
# Create landing page
|
||||
- name: Create landing page
|
||||
run: |
|
||||
cat > docs-site/index.html << 'EOF'
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Sleigh Documentation</title>
|
||||
<style>
|
||||
:root {
|
||||
--bg-color: #f5f5f5;
|
||||
--text-color: #333;
|
||||
--text-muted: #666;
|
||||
--card-bg: white;
|
||||
--card-shadow: rgba(0,0,0,0.1);
|
||||
--card-shadow-hover: rgba(0,0,0,0.15);
|
||||
--link-color: #0066cc;
|
||||
}
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
--bg-color: #1a1a1a;
|
||||
--text-color: #e0e0e0;
|
||||
--text-muted: #a0a0a0;
|
||||
--card-bg: #2d2d2d;
|
||||
--card-shadow: rgba(0,0,0,0.3);
|
||||
--card-shadow-hover: rgba(0,0,0,0.4);
|
||||
--link-color: #4da6ff;
|
||||
}
|
||||
}
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
padding: 2rem;
|
||||
background: var(--bg-color);
|
||||
color: var(--text-color);
|
||||
}
|
||||
h1 {
|
||||
color: var(--text-color);
|
||||
}
|
||||
.cards {
|
||||
display: flex;
|
||||
gap: 1rem;
|
||||
margin-top: 2rem;
|
||||
}
|
||||
.card {
|
||||
flex: 1;
|
||||
background: var(--card-bg);
|
||||
border-radius: 8px;
|
||||
padding: 1.5rem;
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
box-shadow: 0 2px 4px var(--card-shadow);
|
||||
transition: box-shadow 0.2s;
|
||||
}
|
||||
.card:hover {
|
||||
box-shadow: 0 4px 8px var(--card-shadow-hover);
|
||||
}
|
||||
.card h2 {
|
||||
margin-top: 0;
|
||||
color: var(--link-color);
|
||||
}
|
||||
.card p {
|
||||
color: var(--text-muted);
|
||||
margin-bottom: 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Sleigh Documentation</h1>
|
||||
<p>Select a documentation version:</p>
|
||||
<div class="cards">
|
||||
<a href="stable/" class="card">
|
||||
<h2>Stable</h2>
|
||||
<p>Documentation for the latest stable release.</p>
|
||||
</a>
|
||||
<a href="HEAD/" class="card">
|
||||
<h2>HEAD</h2>
|
||||
<p>Documentation for the latest Ghidra HEAD development version.</p>
|
||||
</a>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
EOF
|
||||
|
||||
- name: Upload Pages artifact
|
||||
uses: actions/upload-pages-artifact@v4
|
||||
with:
|
||||
path: docs-site
|
||||
|
||||
- name: Deploy to GitHub Pages
|
||||
id: deployment
|
||||
uses: actions/deploy-pages@v4
|
||||
@@ -67,7 +67,7 @@ jobs:
|
||||
file(APPEND "$ENV{GITHUB_ENV}" "CACHE_TIMESTAMP=${current_date}\n")
|
||||
|
||||
- name: Update the cache (ccache)
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: "${{ github.workspace }}/ccache"
|
||||
key: ${{ env.CACHE_KEY }}_ccache_${{ env.CACHE_TIMESTAMP }}
|
||||
@@ -214,7 +214,7 @@ jobs:
|
||||
# DEB Package
|
||||
- name: Upload the DEB package artifact (RelWithDebInfo only)
|
||||
if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux'
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: ${{ env.DEB_PACKAGE_NAME }}
|
||||
path: ${{ env.DEB_PACKAGE_PATH }}
|
||||
@@ -228,7 +228,7 @@ jobs:
|
||||
# RPM Package
|
||||
- name: Upload the RPM package artifact (RelWithDebInfo only)
|
||||
if: matrix.build_type == 'RelWithDebInfo' && runner.os == 'Linux'
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: ${{ env.RPM_PACKAGE_NAME }}
|
||||
path: ${{ env.RPM_PACKAGE_PATH }}
|
||||
@@ -241,7 +241,7 @@ jobs:
|
||||
# TGZ Package
|
||||
- name: Upload the TGZ package artifact (RelWithDebInfo only)
|
||||
if: matrix.build_type == 'RelWithDebInfo'
|
||||
uses: actions/upload-artifact@v5
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: ${{ env.TGZ_PACKAGE_NAME }}
|
||||
path: ${{ env.TGZ_PACKAGE_PATH }}
|
||||
|
||||
@@ -26,37 +26,79 @@ jobs:
|
||||
python3 scripts/update_ghidra_head.py --ci
|
||||
|
||||
# Need this to run further Actions on the newly created PR
|
||||
# See here for more details https://github.com/peter-evans/create-pull-request/blob/28fa4848947e0faa7fa50647691d01477589d5e9/docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens
|
||||
- uses: tibdex/github-app-token@v2
|
||||
# See here for more details https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens
|
||||
- uses: actions/create-github-app-token@v2
|
||||
if: steps.head_update.outputs.did_update
|
||||
id: generate-token
|
||||
with:
|
||||
app_id: ${{ secrets.APP_ID }}
|
||||
private_key: ${{ secrets.APP_PRIVATE_KEY }}
|
||||
|
||||
- name: Create PR
|
||||
- name: Commit, push, and create PR
|
||||
if: steps.head_update.outputs.did_update
|
||||
uses: peter-evans/create-pull-request@v7
|
||||
with:
|
||||
title: Update Ghidra HEAD to commit ${{ steps.head_update.outputs.short_sha }}
|
||||
commit-message: |
|
||||
Bump Ghidra HEAD commit ${{ steps.head_update.outputs.short_sha }}
|
||||
env:
|
||||
GH_TOKEN: ${{ steps.generate-token.outputs.token }}
|
||||
run: |
|
||||
BRANCH="cron/update-ghidra-${{ steps.head_update.outputs.short_sha }}"
|
||||
|
||||
Changed files:
|
||||
# Check if PR already exists for this branch
|
||||
if gh pr list --head "$BRANCH" --json number --jq '.[0].number' | grep -q .; then
|
||||
echo "PR already exists for branch $BRANCH, skipping"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
${{ steps.head_update.outputs.changed_files }}
|
||||
# Configure git
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
|
||||
Commit details:
|
||||
# Create branch and commit
|
||||
git checkout -b "$BRANCH"
|
||||
git add -A
|
||||
git commit -m "$(cat <<'EOF'
|
||||
Bump Ghidra HEAD commit ${{ steps.head_update.outputs.short_sha }}
|
||||
|
||||
${{ steps.head_update.outputs.commit_details }}
|
||||
body: |
|
||||
Changed files:
|
||||
Changed files:
|
||||
|
||||
${{ steps.head_update.outputs.changed_files }}
|
||||
${{ steps.head_update.outputs.changed_files }}
|
||||
|
||||
Commit details:
|
||||
Commit details:
|
||||
|
||||
${{ steps.head_update.outputs.commit_details }}
|
||||
branch: cron/update-ghidra-${{ steps.head_update.outputs.short_sha }}
|
||||
delete-branch: true
|
||||
token: ${{ steps.generate-token.outputs.token }}
|
||||
${{ steps.head_update.outputs.commit_details }}
|
||||
EOF
|
||||
)"
|
||||
|
||||
# Push branch
|
||||
git push -u origin "$BRANCH"
|
||||
|
||||
# Build PR body
|
||||
PR_BODY="Changed files:
|
||||
|
||||
${{ steps.head_update.outputs.changed_files }}
|
||||
|
||||
Commit details:
|
||||
|
||||
${{ steps.head_update.outputs.commit_details }}"
|
||||
|
||||
# Add intervention warning if needed
|
||||
if [ "${{ steps.head_update.outputs.needs_manual_intervention }}" = "true" ]; then
|
||||
PR_BODY="## :warning: Manual Intervention Required
|
||||
|
||||
The following files were added or deleted and may require manual CMake configuration updates:
|
||||
|
||||
${{ steps.head_update.outputs.intervention_details }}
|
||||
|
||||
### Instructions
|
||||
- **New C++ sources**: Add to appropriate list in \`src/setup-ghidra-source.cmake\`
|
||||
- **Deleted C++ sources**: Remove from \`src/setup-ghidra-source.cmake\`
|
||||
- **New spec files**: Review if \`.slaspec\` files are auto-generated; other types may need manual updates
|
||||
- **Deleted spec files**: Verify no longer referenced
|
||||
|
||||
---
|
||||
|
||||
$PR_BODY"
|
||||
fi
|
||||
|
||||
# Create PR
|
||||
gh pr create \
|
||||
--title "Update Ghidra HEAD to commit ${{ steps.head_update.outputs.short_sha }}" \
|
||||
--body "$PR_BODY"
|
||||
|
||||
+210
-15
@@ -8,6 +8,7 @@ import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
from typing import List, Dict, Optional, Any, Tuple
|
||||
|
||||
@@ -23,12 +24,92 @@ SLEIGH_PATHS = [
|
||||
"Ghidra/Processors", # Sleigh files
|
||||
]
|
||||
|
||||
# File extensions requiring manual CMake intervention
|
||||
CPP_EXTENSIONS = {".cc", ".hh"}
|
||||
SPEC_EXTENSIONS = {".slaspec", ".cspec", ".pspec", ".ldefs", ".opinion", ".sinc"}
|
||||
|
||||
# File extensions to ignore (in addition to .java)
|
||||
IGNORED_EXTENSIONS = {
|
||||
".java",
|
||||
".gradle",
|
||||
".properties",
|
||||
".txt",
|
||||
".md",
|
||||
".html",
|
||||
".xml",
|
||||
".png",
|
||||
".gif",
|
||||
".jpg",
|
||||
".ico",
|
||||
}
|
||||
|
||||
# Paths for categorizing files
|
||||
CPP_PATH = "Ghidra/Features/Decompiler/src/decompile/cpp/"
|
||||
SPEC_PATH_PREFIX = "Ghidra/Processors/"
|
||||
|
||||
# Regex patterns
|
||||
HEAD_COMMIT_PATTERN = r"set\(ghidra_head_git_tag \"([0-9A-Fa-f]+)\"\)"
|
||||
VERSION_PATTERN = r"set\(ghidra_head_version \"([0-9]+(\.[0-9]+)*)\"\)"
|
||||
APP_VERSION_PATTERN = r"application.version=([0-9]+(\.[0-9]+)*)"
|
||||
|
||||
|
||||
@dataclass
|
||||
class CategorizedChanges:
|
||||
"""Holds files categorized by change type and file type."""
|
||||
|
||||
added_cpp: List[str] = field(default_factory=list)
|
||||
deleted_cpp: List[str] = field(default_factory=list)
|
||||
added_spec: List[str] = field(default_factory=list)
|
||||
deleted_spec: List[str] = field(default_factory=list)
|
||||
|
||||
def needs_manual_intervention(self) -> bool:
|
||||
"""Check if any files need manual intervention."""
|
||||
return bool(
|
||||
self.added_cpp or self.deleted_cpp or self.added_spec or self.deleted_spec
|
||||
)
|
||||
|
||||
def format_intervention_details(self) -> str:
|
||||
"""Format the intervention details as markdown."""
|
||||
sections = []
|
||||
|
||||
if self.added_cpp:
|
||||
sections.append("### New C++ Source Files")
|
||||
sections.append(
|
||||
"These files need to be added to `src/setup-ghidra-source.cmake`:"
|
||||
)
|
||||
for f in self.added_cpp:
|
||||
sections.append(f"- `{f}`")
|
||||
sections.append("")
|
||||
|
||||
if self.deleted_cpp:
|
||||
sections.append("### Deleted C++ Source Files")
|
||||
sections.append(
|
||||
"These files need to be removed from `src/setup-ghidra-source.cmake`:"
|
||||
)
|
||||
for f in self.deleted_cpp:
|
||||
sections.append(f"- `{f}`")
|
||||
sections.append("")
|
||||
|
||||
if self.added_spec:
|
||||
sections.append("### New Spec Files")
|
||||
sections.append(
|
||||
"Review if these files need manual CMake updates (`.slaspec` files "
|
||||
"are auto-generated; other types may need manual updates):"
|
||||
)
|
||||
for f in self.added_spec:
|
||||
sections.append(f"- `{f}`")
|
||||
sections.append("")
|
||||
|
||||
if self.deleted_spec:
|
||||
sections.append("### Deleted Spec Files")
|
||||
sections.append("Verify these files are no longer referenced:")
|
||||
for f in self.deleted_spec:
|
||||
sections.append(f"- `{f}`")
|
||||
sections.append("")
|
||||
|
||||
return "\n".join(sections).rstrip()
|
||||
|
||||
|
||||
class GitHelper:
|
||||
"""Helper class for Git operations"""
|
||||
|
||||
@@ -70,6 +151,60 @@ class GitHelper:
|
||||
except subprocess.CalledProcessError:
|
||||
return False
|
||||
|
||||
@staticmethod
|
||||
def _should_ignore_file(file_path: str) -> bool:
|
||||
"""Check if a file should be ignored based on its extension."""
|
||||
ext = Path(file_path).suffix.lower()
|
||||
return ext in IGNORED_EXTENSIONS
|
||||
|
||||
@staticmethod
|
||||
def _categorize_file(
|
||||
status: str, file_path: str, categorized: CategorizedChanges
|
||||
) -> None:
|
||||
"""Categorize a file based on its status and type.
|
||||
|
||||
Args:
|
||||
status: Git status code (A, D, M, R, etc.)
|
||||
file_path: Path to the file
|
||||
categorized: CategorizedChanges object to update
|
||||
"""
|
||||
ext = Path(file_path).suffix.lower()
|
||||
|
||||
# Only categorize added (A) or deleted (D) files
|
||||
if status not in ("A", "D"):
|
||||
return
|
||||
|
||||
# Check if it's a C++ file in the decompiler path
|
||||
if ext in CPP_EXTENSIONS and CPP_PATH in file_path:
|
||||
if status == "A":
|
||||
categorized.added_cpp.append(file_path)
|
||||
else: # status == "D"
|
||||
categorized.deleted_cpp.append(file_path)
|
||||
return
|
||||
|
||||
# Check if it's a spec file in the Processors path
|
||||
if ext in SPEC_EXTENSIONS and file_path.startswith(SPEC_PATH_PREFIX):
|
||||
if status == "A":
|
||||
categorized.added_spec.append(file_path)
|
||||
else: # status == "D"
|
||||
categorized.deleted_spec.append(file_path)
|
||||
|
||||
@staticmethod
|
||||
def _parse_git_status_line(line: str) -> Tuple[str, str, Optional[str]]:
|
||||
"""Parse a git status line from --name-status output.
|
||||
|
||||
Returns:
|
||||
Tuple of (status, file_path, new_path_for_rename)
|
||||
"""
|
||||
parts = line.split("\t")
|
||||
status = parts[0]
|
||||
|
||||
# Handle rename (R100 or similar)
|
||||
if status.startswith("R"):
|
||||
return ("R", parts[1], parts[2])
|
||||
|
||||
return (status, parts[1], None)
|
||||
|
||||
def get_commit_info(
|
||||
self, repo_dir: Path, old_commit: str, new_commit: str, paths: List[str]
|
||||
) -> List[Dict[str, Any]]:
|
||||
@@ -119,8 +254,21 @@ class GitHelper:
|
||||
)
|
||||
|
||||
commit_files = files_result.stdout.strip().splitlines()
|
||||
# Filter out Java files
|
||||
commit_files = [f for f in commit_files if not f.endswith(".java")]
|
||||
# Filter out ignored files
|
||||
filtered_files = []
|
||||
for line in commit_files:
|
||||
if not line.strip():
|
||||
continue
|
||||
status, file_path, new_path = self._parse_git_status_line(line)
|
||||
if status == "R":
|
||||
# For renames, check both old and new paths
|
||||
if not self._should_ignore_file(file_path):
|
||||
filtered_files.append(f"D\t{file_path}")
|
||||
if new_path and not self._should_ignore_file(new_path):
|
||||
filtered_files.append(f"A\t{new_path}")
|
||||
elif not self._should_ignore_file(file_path):
|
||||
filtered_files.append(line)
|
||||
commit_files = filtered_files
|
||||
|
||||
if commit_files:
|
||||
commits.append(
|
||||
@@ -137,8 +285,12 @@ class GitHelper:
|
||||
|
||||
def get_changed_files(
|
||||
self, repo_dir: Path, old_commit: str, new_commit: str, paths: List[str]
|
||||
) -> List[str]:
|
||||
"""Get list of files changed between commits"""
|
||||
) -> Tuple[List[str], CategorizedChanges]:
|
||||
"""Get list of files changed between commits and categorize them.
|
||||
|
||||
Returns:
|
||||
Tuple of (filtered_files_list, categorized_changes)
|
||||
"""
|
||||
result = self.run(
|
||||
[
|
||||
"diff",
|
||||
@@ -151,11 +303,29 @@ class GitHelper:
|
||||
capture_output=True,
|
||||
)
|
||||
|
||||
changed_files = result.stdout.strip().splitlines()
|
||||
# Filter out Java files
|
||||
changed_files = [f for f in changed_files if not f.endswith(".java")]
|
||||
raw_lines = result.stdout.strip().splitlines()
|
||||
filtered_files = []
|
||||
categorized = CategorizedChanges()
|
||||
|
||||
return changed_files
|
||||
for line in raw_lines:
|
||||
if not line.strip():
|
||||
continue
|
||||
|
||||
status, file_path, new_path = self._parse_git_status_line(line)
|
||||
|
||||
if status == "R":
|
||||
# For renames, treat as delete old + add new
|
||||
if not self._should_ignore_file(file_path):
|
||||
filtered_files.append(f"D\t{file_path}")
|
||||
self._categorize_file("D", file_path, categorized)
|
||||
if new_path and not self._should_ignore_file(new_path):
|
||||
filtered_files.append(f"A\t{new_path}")
|
||||
self._categorize_file("A", new_path, categorized)
|
||||
elif not self._should_ignore_file(file_path):
|
||||
filtered_files.append(line)
|
||||
self._categorize_file(status, file_path, categorized)
|
||||
|
||||
return filtered_files, categorized
|
||||
|
||||
|
||||
class GhidraUpdater:
|
||||
@@ -205,16 +375,20 @@ class GhidraUpdater:
|
||||
|
||||
def display_changes(
|
||||
self, repo_dir: Path, start_commit: str, end_commit: str
|
||||
) -> Tuple[List[str], List[Dict[str, Any]]]:
|
||||
"""Display changes between two commits and return the changed files and commit info"""
|
||||
# Get changed files
|
||||
changed_files = self.git.get_changed_files(
|
||||
) -> Tuple[List[str], List[Dict[str, Any]], CategorizedChanges]:
|
||||
"""Display changes between two commits and return the changed files and commit info.
|
||||
|
||||
Returns:
|
||||
Tuple of (changed_files, commit_info, categorized_changes)
|
||||
"""
|
||||
# Get changed files and categorized changes
|
||||
changed_files, categorized = self.git.get_changed_files(
|
||||
repo_dir, start_commit, end_commit, SLEIGH_PATHS
|
||||
)
|
||||
|
||||
if not changed_files:
|
||||
print("No sleigh files were modified between these commits")
|
||||
return [], []
|
||||
return [], [], CategorizedChanges()
|
||||
|
||||
# Output changes for logging
|
||||
num_changed = len(changed_files)
|
||||
@@ -222,6 +396,18 @@ class GhidraUpdater:
|
||||
for file in changed_files:
|
||||
print(f" {file}")
|
||||
|
||||
# Display manual intervention warning if needed
|
||||
if categorized.needs_manual_intervention():
|
||||
print("\n** Manual intervention may be required **")
|
||||
if categorized.added_cpp:
|
||||
print(f" New C++ files: {len(categorized.added_cpp)}")
|
||||
if categorized.deleted_cpp:
|
||||
print(f" Deleted C++ files: {len(categorized.deleted_cpp)}")
|
||||
if categorized.added_spec:
|
||||
print(f" New spec files: {len(categorized.added_spec)}")
|
||||
if categorized.deleted_spec:
|
||||
print(f" Deleted spec files: {len(categorized.deleted_spec)}")
|
||||
|
||||
# Get detailed commit info for logging
|
||||
commit_info = self.git.get_commit_info(
|
||||
repo_dir, start_commit, end_commit, SLEIGH_PATHS
|
||||
@@ -269,7 +455,16 @@ class GhidraUpdater:
|
||||
|
||||
self.log_github_multiline_output("commit_details", "\n".join(details))
|
||||
|
||||
return changed_files, commit_info
|
||||
# Log manual intervention outputs
|
||||
if categorized.needs_manual_intervention():
|
||||
self.log_github_output("needs_manual_intervention", "true")
|
||||
self.log_github_multiline_output(
|
||||
"intervention_details", categorized.format_intervention_details()
|
||||
)
|
||||
else:
|
||||
self.log_github_output("needs_manual_intervention", "false")
|
||||
|
||||
return changed_files, commit_info, categorized
|
||||
|
||||
def update_head_commit(
|
||||
self, repo_dir: Path, setup_file: Path
|
||||
@@ -298,7 +493,7 @@ class GhidraUpdater:
|
||||
print(f"Found new commit: {latest_commit}")
|
||||
|
||||
# Check if sleigh files were updated and display changes
|
||||
changed_files, commit_info = self.display_changes(
|
||||
changed_files, commit_info, _ = self.display_changes(
|
||||
repo_dir, current_commit, latest_commit
|
||||
)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ set_property(CACHE sleigh_RELEASE_TYPE PROPERTY STRINGS "stable" "HEAD")
|
||||
find_package(Git REQUIRED)
|
||||
|
||||
# Ghidra pinned stable version commit
|
||||
set(ghidra_version "12.0")
|
||||
set(ghidra_version "12.0.3")
|
||||
set(ghidra_git_tag "Ghidra_${ghidra_version}_build")
|
||||
set(ghidra_shallow TRUE)
|
||||
|
||||
@@ -51,7 +51,7 @@ if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD")
|
||||
# TODO: CMake only likes numeric characters in the version string....
|
||||
set(ghidra_head_version "12.1")
|
||||
set(ghidra_version "${ghidra_head_version}")
|
||||
set(ghidra_head_git_tag "d83ea17544690518554cdab2c0d8dd4ee1a3e229")
|
||||
set(ghidra_head_git_tag "ccbdd4f66eb92186b695b0f143b90e5ce714bf85")
|
||||
set(ghidra_git_tag "${ghidra_head_git_tag}")
|
||||
set(ghidra_shallow FALSE)
|
||||
set(ghidra_patches
|
||||
|
||||
Reference in New Issue
Block a user