fix

5152Alotobots · Jan 11, 2025 · f24d018 · f24d018
1 parent f85e886
commit f24d018
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/.github/scripts/check_vendordeps.py b/.github/scripts/check_vendordeps.py
@@ -41,20 +41,21 @@ def sanitize_text(self, text: str) -> str:
 
     def get_github_latest(self, repo_url: str, is_wpilib: bool = False) -> Optional[Dict]:
         """Get latest release version from GitHub, including betas."""
+        import sys
         try:
-            print(f"\nChecking releases from: {repo_url}")
+            print(f"\nChecking releases from: {repo_url}", file=sys.stderr)
             response = requests.get(repo_url, headers=self.headers)
             response.raise_for_status()
             releases = response.json()
 
-            print(f"Found {len(releases)} total releases")
+            print(f"Found {len(releases)} total releases", file=sys.stderr)
 
             # For WPILib, filter releases to only include current year
             if is_wpilib:
                 releases = [r for r in releases if '2025' in r['tag_name']]
-                print(f"Found {len(releases)} 2025 releases")
+                print(f"Found {len(releases)} 2025 releases", file=sys.stderr)
                 for r in releases[:5]:  # Show first 5
-                    print(f"Release: {r['name']} (Tag: {r['tag_name']})")
+                    print(f"Release: {r['name']} (Tag: {r['tag_name']})", file=sys.stderr)
 
             # Convert all versions to comparable objects
             parsed_releases = []
@@ -68,27 +69,27 @@ def get_github_latest(self, repo_url: str, is_wpilib: bool = False) -> Optional[
                         'is_beta': release.get('prerelease', False) or 'beta' in tag.lower(),
                         'url': release['html_url']
                     })
-                    print(f"Successfully parsed version: {tag} -> {ver}")
+                    print(f"Successfully parsed version: {tag} -> {ver}", file=sys.stderr)
                 except version.InvalidVersion:
-                    print(f"Skipping invalid version: {tag}")
+                    print(f"Skipping invalid version: {tag}", file=sys.stderr)
                     continue
 
             # Sort by version, highest first
             parsed_releases.sort(key=lambda x: x['version'], reverse=True)
 
             if parsed_releases:
                 latest = parsed_releases[0]
-                print(f"\nSelected latest version: {latest['tag']} (Beta: {latest['is_beta']})")
+                print(f"\nSelected latest version: {latest['tag']} (Beta: {latest['is_beta']})", file=sys.stderr)
                 return {
                     'version': latest['tag'],
                     'is_beta': latest['is_beta'],
                     'url': latest['url']
                 }
-            print("No valid releases found")
+            print("No valid releases found", file=sys.stderr)
             return None
 
         except Exception as e:
-            print(f"Error fetching from GitHub: {e}")
+            print(f"Error fetching from GitHub: {e}", file=sys.stderr)
             return None
 
     def get_current_version(self, file_path: Path) -> Dict:
@@ -147,33 +148,34 @@ def is_newer_version(self, current: Dict, latest: Dict) -> bool:
 
     def check_all_updates(self):
         """Check all vendordeps for updates."""
+        import sys
         updates = []
         vendordeps_dir = Path('vendordeps')
 
-        print("Starting dependency check...")
+        print("Starting dependency check...", file=sys.stderr)
 
         # Check all GitHub-based vendordeps (including Phoenix6)
         for name, url in self.github_sources.items():
-            print(f"\nChecking {name}...")
+            print(f"\nChecking {name}...", file=sys.stderr)
 
             if name == 'WPILib':
                 current = self.get_wpilib_current_version()
                 latest = self.get_github_latest(url, is_wpilib=True)
             else:
                 current_file = next(vendordeps_dir.glob(f"{name}*.json"), None)
                 if not current_file:
-                    print(f"No vendordep file found for {name}")
+                    print(f"No vendordep file found for {name}", file=sys.stderr)
                     continue
-                print(f"Found vendordep file: {current_file}")
+                print(f"Found vendordep file: {current_file}", file=sys.stderr)
                 current = self.get_current_version(current_file)
                 latest = self.get_github_latest(url)
 
             if current and latest:
-                print(f"Current version: {current['version']}")
-                print(f"Latest version: {latest['version']}")
+                print(f"Current version: {current['version']}", file=sys.stderr)
+                print(f"Latest version: {latest['version']}", file=sys.stderr)
 
                 if self.is_newer_version(current, latest):
-                    print(f"Update available for {name}")
+                    print(f"Update available for {name}", file=sys.stderr)
                     updates.append({
                         'name': name,
                         'current': current['version'],
@@ -184,7 +186,7 @@ def check_all_updates(self):
                         'url': latest.get('url')
                     })
             else:
-                print(f"Failed to get version info for {name}")
+                print(f"Failed to get version info for {name}", file=sys.stderr)
 
         return updates
 

diff --git a/.github/workflows/check_vendordeps.yml b/.github/workflows/check_vendordeps.yml
@@ -17,7 +17,9 @@ jobs:
       - name: Check for updates
         id: check
         run: |
-          echo "UPDATES_OUTPUT=$(python .github/scripts/check_vendordeps.py)" >> $GITHUB_OUTPUT
+          # Run script and capture only the JSON output
+          UPDATES_OUTPUT=$(python .github/scripts/check_vendordeps.py 2> >(tee check_deps.log >&2))
+          echo "UPDATES_OUTPUT=$UPDATES_OUTPUT" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Handle Update Issues