Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,28 @@ jobs:
root_location: ${{ matrix.root_location || 'partition=2' }}
shrink_image: ${{ matrix.shrink_image || 'yes' }}
commands: java -jar *.jar --smoketest --platform=${{ matrix.plat_override }}
# Make sure log files contains the image metadata record
- name: Verify image has metadata
run: |
set -e
logs=(photonvision_config/logs/*)
if [ "${logs[0]}" = 'photonvision_config/logs/*' ]; then
echo "No logs found in photonvision_config/logs" >&2
exit 1
fi
if [ ${#logs[@]} -ne 1 ]; then
echo "Expected exactly one file in photonvision_config/logs, found ${#logs[@]}" >&2
ls -1 photonvision_config/logs >&2
exit 1
fi
grep -Eq 'PhotonVision image data: ImageMetadata\[' "${logs[0]}"
if: ${{ (matrix.os) != 'windows-2022' }}
# Upload config directory produced during smoketest
- uses: actions/upload-artifact@v7
with:
archive: true
name: photonvision_smoketest-${{ matrix.image_suffix }}
path: photonvision_config

matrix-checker:
# This job always runs last to set the overall result based on the matrix jobs. If any matrix job failed, this job will fail.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ private static Path getRootFolder() {
}

public static Path getImageMetadataPath() {
return Path.of(getRootFolder().toString(), "image-metadata.json");
// Every image PhotonVision provides places this file in /opt/photonvision/; hard-code that
// assumption
return Path.of("/opt/photonvision/image-metadata.json");
}

ConfigManager(Path configDirectory, ConfigProvider provider) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
public class OsImageData {
private static final Logger logger = new Logger(OsImageData.class, LogGroup.General);

private static File imageMetadataFile =
ConfigManager.getInstance().getImageMetadataPath().toFile();
private static File imageMetadataFile = ConfigManager.getImageMetadataPath().toFile();

public static final Optional<ImageMetadata> IMAGE_METADATA = getImageMetadata();

Expand Down
Loading