Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate software version information in CI and embed it into the image. Version gets read, published to MQTT and displayed in the App drawer. #91

Merged
merged 2 commits into from
May 25, 2024
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
2 changes: 2 additions & 0 deletions .github/assets/openmower_entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ source /config/mower_config.sh
# source the hardware specific default environment (default wheel ticks, antenna position etc)
source $(rospack find open_mower)/params/hardware_specific/$OM_MOWER/default_environment.sh

source /opt/open_mower_ros/version_info.env

exec "$@"
2 changes: 1 addition & 1 deletion .github/workflows/build-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
# list of Docker images to use as base name for tags
images: |
ghcr.io/${{ env.REPOSITORY_LC }}

- run: echo "export OM_SOFTWARE_VERSION=$(git describe --tags || git describe --always || echo "v0.0.0")" > version_info.env
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU (arm64)
if: runner.arch != 'arm64' && matrix.docker_build_arch == 'linux/arm64'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/xbot_monitoring
1 change: 1 addition & 0 deletions src/open_mower/launch/open_mower.launch
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<param name="external_mqtt_username" value="$(optenv OM_MQTT_USER)" />
<param name="external_mqtt_password" value="$(optenv OM_MQTT_PASSWORD)" />
<param name="external_mqtt_topic_prefix" value="$(optenv OM_MQTT_TOPIC_PREFIX)" />
<param name="software_version" value="$(optenv OM_SOFTWARE_VERSION)" />
<remap from="/xbot_monitoring/remote_cmd_vel" to="/joy_vel"/>
</node>

Expand Down
6 changes: 3 additions & 3 deletions web/flutter_service_worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ const TEMP = 'flutter-temp-cache';
const CACHE_NAME = 'flutter-app-cache';

const RESOURCES = {"manifest.json": "9dc2fb1253b1db2fa707c5acc428713f",
"main.dart.js": "f26bc96c85eb7ce69026e2e0a7b8c3a5",
"main.dart.js": "83e3cb7a99c890e695f78b9db289fd0a",
"version.json": "9ba527477f18934cbd53f1ada1133d9a",
"index.html": "20a8bbfd9e604a40646565489e64da80",
"/": "20a8bbfd9e604a40646565489e64da80",
"index.html": "76dc0fbbe08b7c2e7b1b95ce26079096",
"/": "76dc0fbbe08b7c2e7b1b95ce26079096",
"icons/Icon-maskable-192.png": "c457ef57daa1d16f64b27b786ec2ea3c",
"icons/Icon-192.png": "ac9a721a12bbc803b44f645561ecb1e1",
"icons/Icon-512.png": "96e752610906ba2a93c65f8abe1645f1",
Expand Down
2 changes: 1 addition & 1 deletion web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<script>
// The value below is injected by flutter build, do not touch.
const serviceWorkerVersion = "1499740367";
const serviceWorkerVersion = "940210188";
</script>
<!-- This script adds the flutter initialization JS code -->
<script src="flutter.js" defer></script>
Expand Down
Loading