From 50124c370b134dffd8388a73e9d909933866e6b4 Mon Sep 17 00:00:00 2001 From: David Greaves Date: Thu, 1 Feb 2024 18:56:43 +0000 Subject: [PATCH 1/4] Added all submodules at the dev branch Signed-off-by: David Greaves --- .gitmodules | 141 +++++++++++++++++++++++++++ ovos-PHAL | 1 + ovos-PHAL-plugin-ipgeo | 1 + ovos-PHAL-plugin-oauth | 1 + ovos-audio | 1 + ovos-audio-transformer-plugin-ggwave | 1 + ovos-backend-client | 1 + ovos-bus-client | 1 + ovos-cli-client | 1 + ovos-config | 1 + ovos-core | 1 + ovos-dinkum-listener | 1 + ovos-lingua-franca | 1 + ovos-messagebus | 1 + ovos-microphone-plugin-sounddevice | 1 + ovos-ocp-audio-plugin | 1 + ovos-phal-plugin-alsa | 1 + ovos-phal-plugin-connectivity-events | 1 + ovos-phal-plugin-system | 1 + ovos-plugin-manager | 1 + ovos-stt-plugin-server | 1 + ovos-tts-plugin-mimic | 1 + ovos-tts-plugin-mimic3-server | 1 + ovos-tts-plugin-piper | 1 + ovos-tts-server-plugin | 1 + ovos-utils | 1 + ovos-vad-plugin-silero | 1 + ovos-vad-plugin-webrtcvad | 1 + ovos-workshop | 1 + ovos-ww-plugin-pocketsphinx | 1 + ovos-ww-plugin-precise | 1 + ovos-ww-plugin-precise-lite | 1 + skill-alerts | 1 + skill-ovos-date-time | 1 + skill-ovos-ddg | 1 + skill-ovos-fallback-chatgpt | 1 + skill-ovos-fallback-unknown | 1 + skill-ovos-hello-world | 1 + skill-ovos-naptime | 1 + skill-ovos-news | 1 + skill-ovos-personal | 1 + skill-ovos-somafm | 1 + skill-ovos-stop | 1 + skill-ovos-volume | 1 + skill-ovos-weather | 1 + skill-ovos-wikipedia | 1 + skill-ovos-wolfie | 1 + skill-ovos-youtube-music | 1 + 48 files changed, 188 insertions(+) create mode 100644 .gitmodules create mode 160000 ovos-PHAL create mode 160000 ovos-PHAL-plugin-ipgeo create mode 160000 ovos-PHAL-plugin-oauth create mode 160000 ovos-audio create mode 160000 ovos-audio-transformer-plugin-ggwave create mode 160000 ovos-backend-client create mode 160000 ovos-bus-client create mode 160000 ovos-cli-client create mode 160000 ovos-config create mode 160000 ovos-core create mode 160000 ovos-dinkum-listener create mode 160000 ovos-lingua-franca create mode 160000 ovos-messagebus create mode 160000 ovos-microphone-plugin-sounddevice create mode 160000 ovos-ocp-audio-plugin create mode 160000 ovos-phal-plugin-alsa create mode 160000 ovos-phal-plugin-connectivity-events create mode 160000 ovos-phal-plugin-system create mode 160000 ovos-plugin-manager create mode 160000 ovos-stt-plugin-server create mode 160000 ovos-tts-plugin-mimic create mode 160000 ovos-tts-plugin-mimic3-server create mode 160000 ovos-tts-plugin-piper create mode 160000 ovos-tts-server-plugin create mode 160000 ovos-utils create mode 160000 ovos-vad-plugin-silero create mode 160000 ovos-vad-plugin-webrtcvad create mode 160000 ovos-workshop create mode 160000 ovos-ww-plugin-pocketsphinx create mode 160000 ovos-ww-plugin-precise create mode 160000 ovos-ww-plugin-precise-lite create mode 160000 skill-alerts create mode 160000 skill-ovos-date-time create mode 160000 skill-ovos-ddg create mode 160000 skill-ovos-fallback-chatgpt create mode 160000 skill-ovos-fallback-unknown create mode 160000 skill-ovos-hello-world create mode 160000 skill-ovos-naptime create mode 160000 skill-ovos-news create mode 160000 skill-ovos-personal create mode 160000 skill-ovos-somafm create mode 160000 skill-ovos-stop create mode 160000 skill-ovos-volume create mode 160000 skill-ovos-weather create mode 160000 skill-ovos-wikipedia create mode 160000 skill-ovos-wolfie create mode 160000 skill-ovos-youtube-music diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2060474 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,141 @@ +[submodule "ovos-backend-client"] + path = ovos-backend-client + url = https://github.com/OpenVoiceOS/ovos-backend-client +[submodule "ovos-core"] + path = ovos-core + url = https://github.com/OpenVoiceOS/ovos-core +[submodule "ovos-audio"] + path = ovos-audio + url = https://github.com/OpenVoiceOS/ovos-audio +[submodule "ovos-ocp-audio-plugin"] + path = ovos-ocp-audio-plugin + url = https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin +[submodule "ovos-messagebus"] + path = ovos-messagebus + url = https://github.com/OpenVoiceOS/ovos-messagebus +[submodule "ovos-dinkum-listener"] + path = ovos-dinkum-listener + url = https://github.com/OpenVoiceOS/ovos-dinkum-listener +[submodule "ovos-vad-plugin-silero"] + path = ovos-vad-plugin-silero + url = https://github.com/OpenVoiceOS/ovos-vad-plugin-silero +[submodule "ovos-ww-plugin-pocketsphinx"] + path = ovos-ww-plugin-pocketsphinx + url = https://github.com/OpenVoiceOS/ovos-ww-plugin-pocketsphinx +[submodule "ovos-audio-transformer-plugin-ggwave"] + path = ovos-audio-transformer-plugin-ggwave + url = https://github.com/OpenVoiceOS/ovos-audio-transformer-plugin-ggwave +[submodule "ovos-ww-plugin-precise"] + path = ovos-ww-plugin-precise + url = https://github.com/OpenVoiceOS/ovos-ww-plugin-precise +[submodule "ovos-ww-plugin-precise-lite"] + path = ovos-ww-plugin-precise-lite + url = https://github.com/OpenVoiceOS/ovos-ww-plugin-precise-lite +[submodule "ovos-workshop"] + path = ovos-workshop + url = https://github.com/OpenVoiceOS/ovos-workshop +[submodule "ovos-lingua-franca"] + path = ovos-lingua-franca + url = https://github.com/OpenVoiceOS/ovos-lingua-franca +[submodule "ovos-vad-plugin-webrtcvad"] + path = ovos-vad-plugin-webrtcvad + url = https://github.com/OpenVoiceOS/ovos-vad-plugin-webrtcvad +[submodule "ovos-microphone-plugin-sounddevice"] + path = ovos-microphone-plugin-sounddevice + url = https://github.com/OpenVoiceOS/ovos-microphone-plugin-sounddevice +[submodule "ovos-stt-plugin-server"] + path = ovos-stt-plugin-server + url = https://github.com/OpenVoiceOS/ovos-stt-plugin-server +[submodule "ovos-tts-plugin-mimic3-server"] + path = ovos-tts-plugin-mimic3-server + url = https://github.com/OpenVoiceOS/ovos-tts-plugin-mimic3-server +[submodule "ovos-tts-plugin-mimic"] + path = ovos-tts-plugin-mimic + url = https://github.com/OpenVoiceOS/ovos-tts-plugin-mimic +[submodule "ovos-tts-plugin-piper"] + path = ovos-tts-plugin-piper + url = https://github.com/OpenVoiceOS/ovos-tts-plugin-piper +[submodule "ovos-tts-server-plugin"] + path = ovos-tts-server-plugin + url = https://github.com/OpenVoiceOS/ovos-tts-server-plugin +[submodule "ovos-config"] + path = ovos-config + url = https://github.com/OpenVoiceOS/ovos-config +[submodule "ovos-utils"] + path = ovos-utils + url = https://github.com/OpenVoiceOS/ovos-utils +[submodule "ovos-bus-client"] + path = ovos-bus-client + url = https://github.com/OpenVoiceOS/ovos-bus-client +[submodule "ovos-plugin-manager"] + path = ovos-plugin-manager + url = https://github.com/OpenVoiceOS/ovos-plugin-manager +[submodule "ovos-cli-client"] + path = ovos-cli-client + url = https://github.com/OpenVoiceOS/ovos-cli-client +[submodule "ovos-PHAL"] + path = ovos-PHAL + url = https://github.com/OpenVoiceOS/ovos-PHAL +[submodule "ovos-phal-plugin-connectivity-events"] + path = ovos-phal-plugin-connectivity-events + url = https://github.com/OpenVoiceOS/ovos-phal-plugin-connectivity-events +[submodule "ovos-phal-plugin-system"] + path = ovos-phal-plugin-system + url = https://github.com/OpenVoiceOS/ovos-phal-plugin-system +[submodule "ovos-PHAL-plugin-ipgeo"] + path = ovos-PHAL-plugin-ipgeo + url = https://github.com/OpenVoiceOS/ovos-PHAL-plugin-ipgeo +[submodule "ovos-PHAL-plugin-oauth"] + path = ovos-PHAL-plugin-oauth + url = https://github.com/OpenVoiceOS/ovos-PHAL-plugin-oauth +[submodule "ovos-phal-plugin-alsa"] + path = ovos-phal-plugin-alsa + url = https://github.com/OpenVoiceOS/ovos-phal-plugin-alsa +[submodule "skill-ovos-volume"] + path = skill-ovos-volume + url = https://github.com/OpenVoiceOS/skill-ovos-volume +[submodule "skill-ovos-fallback-unknown"] + path = skill-ovos-fallback-unknown + url = https://github.com/OpenVoiceOS/skill-ovos-fallback-unknown +[submodule "skill-ovos-stop"] + path = skill-ovos-stop + url = https://github.com/OpenVoiceOS/skill-ovos-stop +[submodule "skill-alerts"] + path = skill-alerts + url = https://github.com/OpenVoiceOS/skill-alerts +[submodule "skill-ovos-personal"] + path = skill-ovos-personal + url = https://github.com/OpenVoiceOS/skill-ovos-personal +[submodule "skill-ovos-naptime"] + path = skill-ovos-naptime + url = https://github.com/OpenVoiceOS/skill-ovos-naptime +[submodule "skill-ovos-date-time"] + path = skill-ovos-date-time + url = https://github.com/OpenVoiceOS/skill-ovos-date-time +[submodule "skill-ovos-weather"] + path = skill-ovos-weather + url = https://github.com/OpenVoiceOS/skill-ovos-weather +[submodule "skill-ovos-hello-world"] + path = skill-ovos-hello-world + url = https://github.com/OpenVoiceOS/skill-ovos-hello-world +[submodule "skill-ovos-ddg"] + path = skill-ovos-ddg + url = https://github.com/OpenVoiceOS/skill-ovos-ddg +[submodule "skill-ovos-wolfie"] + path = skill-ovos-wolfie + url = https://github.com/OpenVoiceOS/skill-ovos-wolfie +[submodule "skill-ovos-wikipedia"] + path = skill-ovos-wikipedia + url = https://github.com/OpenVoiceOS/skill-ovos-wikipedia +[submodule "skill-ovos-fallback-chatgpt"] + path = skill-ovos-fallback-chatgpt + url = https://github.com/OpenVoiceOS/skill-ovos-fallback-chatgpt +[submodule "skill-ovos-news"] + path = skill-ovos-news + url = https://github.com/OpenVoiceOS/skill-ovos-news +[submodule "skill-ovos-somafm"] + path = skill-ovos-somafm + url = https://github.com/OpenVoiceOS/skill-ovos-somafm +[submodule "skill-ovos-youtube-music"] + path = skill-ovos-youtube-music + url = https://github.com/OpenVoiceOS/skill-ovos-youtube-music diff --git a/ovos-PHAL b/ovos-PHAL new file mode 160000 index 0000000..09f8b33 --- /dev/null +++ b/ovos-PHAL @@ -0,0 +1 @@ +Subproject commit 09f8b33460d2c785623f8b1c0ab73d50762064da diff --git a/ovos-PHAL-plugin-ipgeo b/ovos-PHAL-plugin-ipgeo new file mode 160000 index 0000000..13a2669 --- /dev/null +++ b/ovos-PHAL-plugin-ipgeo @@ -0,0 +1 @@ +Subproject commit 13a2669b41959b7d26cee4e7a8f6788d81ce6842 diff --git a/ovos-PHAL-plugin-oauth b/ovos-PHAL-plugin-oauth new file mode 160000 index 0000000..4c67985 --- /dev/null +++ b/ovos-PHAL-plugin-oauth @@ -0,0 +1 @@ +Subproject commit 4c67985a5708eba1ba16bd90c10f319847eba09f diff --git a/ovos-audio b/ovos-audio new file mode 160000 index 0000000..00f0b99 --- /dev/null +++ b/ovos-audio @@ -0,0 +1 @@ +Subproject commit 00f0b99b106ccf31bac2eb389bae43a125d720e0 diff --git a/ovos-audio-transformer-plugin-ggwave b/ovos-audio-transformer-plugin-ggwave new file mode 160000 index 0000000..6bea333 --- /dev/null +++ b/ovos-audio-transformer-plugin-ggwave @@ -0,0 +1 @@ +Subproject commit 6bea3337c6ef387512d6b9d394af759eb306a9c8 diff --git a/ovos-backend-client b/ovos-backend-client new file mode 160000 index 0000000..cf102ba --- /dev/null +++ b/ovos-backend-client @@ -0,0 +1 @@ +Subproject commit cf102ba1b63bf3c91fc7d8c479d64520dade1dd4 diff --git a/ovos-bus-client b/ovos-bus-client new file mode 160000 index 0000000..34de9d3 --- /dev/null +++ b/ovos-bus-client @@ -0,0 +1 @@ +Subproject commit 34de9d3f2f8f68046604de2530dbf7bf638001d4 diff --git a/ovos-cli-client b/ovos-cli-client new file mode 160000 index 0000000..e7c1b5c --- /dev/null +++ b/ovos-cli-client @@ -0,0 +1 @@ +Subproject commit e7c1b5c6b471822a237d6367c4b1b4d3fcf284a7 diff --git a/ovos-config b/ovos-config new file mode 160000 index 0000000..35e83db --- /dev/null +++ b/ovos-config @@ -0,0 +1 @@ +Subproject commit 35e83db07b38d933e459e5944f34f146a0b7d170 diff --git a/ovos-core b/ovos-core new file mode 160000 index 0000000..b8404ca --- /dev/null +++ b/ovos-core @@ -0,0 +1 @@ +Subproject commit b8404ca9d1f278992f5f2963d5748d933c6ffb5d diff --git a/ovos-dinkum-listener b/ovos-dinkum-listener new file mode 160000 index 0000000..4f68806 --- /dev/null +++ b/ovos-dinkum-listener @@ -0,0 +1 @@ +Subproject commit 4f68806aa552063f09f65af7b3cc0786e506dcb7 diff --git a/ovos-lingua-franca b/ovos-lingua-franca new file mode 160000 index 0000000..a47410e --- /dev/null +++ b/ovos-lingua-franca @@ -0,0 +1 @@ +Subproject commit a47410e1a62d1afbc54fd546afb2bbe3051a4410 diff --git a/ovos-messagebus b/ovos-messagebus new file mode 160000 index 0000000..1025830 --- /dev/null +++ b/ovos-messagebus @@ -0,0 +1 @@ +Subproject commit 10258300ab734e0c4a462e50b12cc1f784d5b8c8 diff --git a/ovos-microphone-plugin-sounddevice b/ovos-microphone-plugin-sounddevice new file mode 160000 index 0000000..2d57baf --- /dev/null +++ b/ovos-microphone-plugin-sounddevice @@ -0,0 +1 @@ +Subproject commit 2d57baf82f06e9ccd09ab370aa5b6ee222797957 diff --git a/ovos-ocp-audio-plugin b/ovos-ocp-audio-plugin new file mode 160000 index 0000000..12fe606 --- /dev/null +++ b/ovos-ocp-audio-plugin @@ -0,0 +1 @@ +Subproject commit 12fe606e45960bacb4852d6b30eacf3bbbb743de diff --git a/ovos-phal-plugin-alsa b/ovos-phal-plugin-alsa new file mode 160000 index 0000000..da06817 --- /dev/null +++ b/ovos-phal-plugin-alsa @@ -0,0 +1 @@ +Subproject commit da06817ddd9d03c0dcf611f05d5fa6fa36cd294f diff --git a/ovos-phal-plugin-connectivity-events b/ovos-phal-plugin-connectivity-events new file mode 160000 index 0000000..88cd590 --- /dev/null +++ b/ovos-phal-plugin-connectivity-events @@ -0,0 +1 @@ +Subproject commit 88cd5901dfad2853ef7f355db9ad022e5051df6a diff --git a/ovos-phal-plugin-system b/ovos-phal-plugin-system new file mode 160000 index 0000000..4b58bec --- /dev/null +++ b/ovos-phal-plugin-system @@ -0,0 +1 @@ +Subproject commit 4b58bec82b4faf75ec4da73411297ac0a29b500f diff --git a/ovos-plugin-manager b/ovos-plugin-manager new file mode 160000 index 0000000..36b67e9 --- /dev/null +++ b/ovos-plugin-manager @@ -0,0 +1 @@ +Subproject commit 36b67e9ced100e9075c60017549a97e69a666b81 diff --git a/ovos-stt-plugin-server b/ovos-stt-plugin-server new file mode 160000 index 0000000..b9415a8 --- /dev/null +++ b/ovos-stt-plugin-server @@ -0,0 +1 @@ +Subproject commit b9415a8601e82a96bb82996d4024431d76de2ec8 diff --git a/ovos-tts-plugin-mimic b/ovos-tts-plugin-mimic new file mode 160000 index 0000000..92f35d1 --- /dev/null +++ b/ovos-tts-plugin-mimic @@ -0,0 +1 @@ +Subproject commit 92f35d19f07d2d456e086367f2ccb2ff447d0e4e diff --git a/ovos-tts-plugin-mimic3-server b/ovos-tts-plugin-mimic3-server new file mode 160000 index 0000000..3f3f7dc --- /dev/null +++ b/ovos-tts-plugin-mimic3-server @@ -0,0 +1 @@ +Subproject commit 3f3f7dc8937b62cefaff3527b90ec2d04e5861cc diff --git a/ovos-tts-plugin-piper b/ovos-tts-plugin-piper new file mode 160000 index 0000000..708d82f --- /dev/null +++ b/ovos-tts-plugin-piper @@ -0,0 +1 @@ +Subproject commit 708d82f6e6db8462b62347959760b8c6e3903540 diff --git a/ovos-tts-server-plugin b/ovos-tts-server-plugin new file mode 160000 index 0000000..8a6d8a1 --- /dev/null +++ b/ovos-tts-server-plugin @@ -0,0 +1 @@ +Subproject commit 8a6d8a1804fa8069ea330ab8af5aaf82f663dc63 diff --git a/ovos-utils b/ovos-utils new file mode 160000 index 0000000..56aabe2 --- /dev/null +++ b/ovos-utils @@ -0,0 +1 @@ +Subproject commit 56aabe28f39d8d4429ec85024fd711da9cc62d7c diff --git a/ovos-vad-plugin-silero b/ovos-vad-plugin-silero new file mode 160000 index 0000000..65fe25e --- /dev/null +++ b/ovos-vad-plugin-silero @@ -0,0 +1 @@ +Subproject commit 65fe25ee4a0723633f6328f7bbbf4a3c02e254bb diff --git a/ovos-vad-plugin-webrtcvad b/ovos-vad-plugin-webrtcvad new file mode 160000 index 0000000..f1a0cd1 --- /dev/null +++ b/ovos-vad-plugin-webrtcvad @@ -0,0 +1 @@ +Subproject commit f1a0cd1d90aad8399eff379e59e57f5f5dad1aee diff --git a/ovos-workshop b/ovos-workshop new file mode 160000 index 0000000..521c1bc --- /dev/null +++ b/ovos-workshop @@ -0,0 +1 @@ +Subproject commit 521c1bcc034ec4895509a92e99c51cd123de5e66 diff --git a/ovos-ww-plugin-pocketsphinx b/ovos-ww-plugin-pocketsphinx new file mode 160000 index 0000000..06183f4 --- /dev/null +++ b/ovos-ww-plugin-pocketsphinx @@ -0,0 +1 @@ +Subproject commit 06183f4cf51e94cf0fd76cdb3f134789d787330a diff --git a/ovos-ww-plugin-precise b/ovos-ww-plugin-precise new file mode 160000 index 0000000..e33f866 --- /dev/null +++ b/ovos-ww-plugin-precise @@ -0,0 +1 @@ +Subproject commit e33f8663d6f2971ba87368ffaa61c702823efab1 diff --git a/ovos-ww-plugin-precise-lite b/ovos-ww-plugin-precise-lite new file mode 160000 index 0000000..d765138 --- /dev/null +++ b/ovos-ww-plugin-precise-lite @@ -0,0 +1 @@ +Subproject commit d765138ecefc2004204d6a3fd817d30f8ccca1d8 diff --git a/skill-alerts b/skill-alerts new file mode 160000 index 0000000..7066e2d --- /dev/null +++ b/skill-alerts @@ -0,0 +1 @@ +Subproject commit 7066e2da917526a518b776d3fe8a10c24b29a2e6 diff --git a/skill-ovos-date-time b/skill-ovos-date-time new file mode 160000 index 0000000..1f14dd3 --- /dev/null +++ b/skill-ovos-date-time @@ -0,0 +1 @@ +Subproject commit 1f14dd358143da78b529a73e39d2ddef6aac58ae diff --git a/skill-ovos-ddg b/skill-ovos-ddg new file mode 160000 index 0000000..4cac626 --- /dev/null +++ b/skill-ovos-ddg @@ -0,0 +1 @@ +Subproject commit 4cac626086105bfc4366bdf1acb16ff9c94157c0 diff --git a/skill-ovos-fallback-chatgpt b/skill-ovos-fallback-chatgpt new file mode 160000 index 0000000..8c95bcb --- /dev/null +++ b/skill-ovos-fallback-chatgpt @@ -0,0 +1 @@ +Subproject commit 8c95bcb91f6f7523fb9d4fb118d3e7327b4a0c17 diff --git a/skill-ovos-fallback-unknown b/skill-ovos-fallback-unknown new file mode 160000 index 0000000..3c7353e --- /dev/null +++ b/skill-ovos-fallback-unknown @@ -0,0 +1 @@ +Subproject commit 3c7353e3114f32471e119fd05fffd625af573fae diff --git a/skill-ovos-hello-world b/skill-ovos-hello-world new file mode 160000 index 0000000..42bee01 --- /dev/null +++ b/skill-ovos-hello-world @@ -0,0 +1 @@ +Subproject commit 42bee014eebbd251e874a1fdb4e9766086e83c18 diff --git a/skill-ovos-naptime b/skill-ovos-naptime new file mode 160000 index 0000000..ce59adb --- /dev/null +++ b/skill-ovos-naptime @@ -0,0 +1 @@ +Subproject commit ce59adb694629b37b49d4fa069c82dead7724b8a diff --git a/skill-ovos-news b/skill-ovos-news new file mode 160000 index 0000000..2cad72f --- /dev/null +++ b/skill-ovos-news @@ -0,0 +1 @@ +Subproject commit 2cad72f7b9aaa64d399cc20d7b12fd9d0d1825f8 diff --git a/skill-ovos-personal b/skill-ovos-personal new file mode 160000 index 0000000..d4da33d --- /dev/null +++ b/skill-ovos-personal @@ -0,0 +1 @@ +Subproject commit d4da33da01f4639ed9dc394abc93609f848bac76 diff --git a/skill-ovos-somafm b/skill-ovos-somafm new file mode 160000 index 0000000..b3496f2 --- /dev/null +++ b/skill-ovos-somafm @@ -0,0 +1 @@ +Subproject commit b3496f292431d19c0fad164f4d6087fc2434e127 diff --git a/skill-ovos-stop b/skill-ovos-stop new file mode 160000 index 0000000..34ebb09 --- /dev/null +++ b/skill-ovos-stop @@ -0,0 +1 @@ +Subproject commit 34ebb096747f1ee199b06f44f4d9274b8a580491 diff --git a/skill-ovos-volume b/skill-ovos-volume new file mode 160000 index 0000000..eed93b2 --- /dev/null +++ b/skill-ovos-volume @@ -0,0 +1 @@ +Subproject commit eed93b23d6bb7caacf07a05f7ba64aee7f4e741b diff --git a/skill-ovos-weather b/skill-ovos-weather new file mode 160000 index 0000000..355c9c0 --- /dev/null +++ b/skill-ovos-weather @@ -0,0 +1 @@ +Subproject commit 355c9c0f96799a93f94e3ad4ae7be3716c84a5c5 diff --git a/skill-ovos-wikipedia b/skill-ovos-wikipedia new file mode 160000 index 0000000..6481d25 --- /dev/null +++ b/skill-ovos-wikipedia @@ -0,0 +1 @@ +Subproject commit 6481d2598f2ad59c3e3eb4e6917ac27e268a19fa diff --git a/skill-ovos-wolfie b/skill-ovos-wolfie new file mode 160000 index 0000000..ea7995d --- /dev/null +++ b/skill-ovos-wolfie @@ -0,0 +1 @@ +Subproject commit ea7995d3460119f37cd64f4b699f95df2af7ca4e diff --git a/skill-ovos-youtube-music b/skill-ovos-youtube-music new file mode 160000 index 0000000..1011a42 --- /dev/null +++ b/skill-ovos-youtube-music @@ -0,0 +1 @@ +Subproject commit 1011a42fcf90f7aee96c91943e13b641027f1fcb From 3f83ca228160d4ce889d0a8666af097a07128dff Mon Sep 17 00:00:00 2001 From: David Greaves Date: Sat, 3 Feb 2024 17:28:22 +0000 Subject: [PATCH 2/4] git submodule foreach git pull origin dev Signed-off-by: David Greaves --- ovos-bus-client | 2 +- ovos-core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ovos-bus-client b/ovos-bus-client index 34de9d3..c14f127 160000 --- a/ovos-bus-client +++ b/ovos-bus-client @@ -1 +1 @@ -Subproject commit 34de9d3f2f8f68046604de2530dbf7bf638001d4 +Subproject commit c14f127bc434b04dd8bfe15df4bc87fc054e666e diff --git a/ovos-core b/ovos-core index b8404ca..e157420 160000 --- a/ovos-core +++ b/ovos-core @@ -1 +1 @@ -Subproject commit b8404ca9d1f278992f5f2963d5748d933c6ffb5d +Subproject commit e157420765f5b8ea24af5f7d8dc32f6f252e97c7 From 39c0efb82290afafda1ec25dfa001bc87764e850 Mon Sep 17 00:00:00 2001 From: David Greaves Date: Sat, 3 Feb 2024 17:28:49 +0000 Subject: [PATCH 3/4] Initial documentation on branches in ovos-releases Additional thoughts: I'm not sure a dev branch is needed on ovos-releases now. The chat discussion said: "The dev branch will always reflect the dev branch of all submodules". However that seems to be better handled by an rc/$R branch. I see no need for a testing branch in ovos-releases either. At any time a rc/$R-rc$X tag can be created which can be a test point. This avoid bugs filed against "testing" which would be a moving target. I'm not sure a stable "branch" really make sense either; branches continually change. If it's stable it should be a tag. Even 'latest' should be a tag rather than a branch. Signed-off-by: David Greaves --- README.md | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 792d600..2282044 100644 --- a/README.md +++ b/README.md @@ -1 +1,92 @@ -# +# Overview + +This repository contains submodules for all the git repos that form an OVOS release. + +It provides a convenient way for developers to work on OVOS as a whole and a reliable way to define the code contained in a release. + +As such the main use of the ovos-releases repo will be +1. for developers to track ongoing collaborative work by simply pull/updating all submodules +2. for users and/or testers to obtain fixed snapshots of OVOS as a whole. + +This is currently a proposal/wip and is intended to be expanded and refined. + +## Releases +Releases will be represented by a tag in this ovos-releases repo. + +This will identify the exact commit in each submodule that will be used for that release. + +# Useful branches + +There will be two types of branches in ovos-releases: release-candidate (rc/) and feature (feat/). + +## Release branches : rc/$R + +The rc/$R branch is the development branch for working towards release $R and, post-release, for providing point-release updates. + +The rc/$R branch will automatically be kept up-to-date with the dev branches of all submodules. + +Release candidates (testing points) and releases are tagged on the rc/$R branch. + +After a release, the rc/$R+1 branch will be created and will become the new default branch. + +The (now-old) rc/$R-1 branch may have bug fixes applied and subsequent point releases may be tagged along the 'old' rc/$R-1 branch. + +Submodules will not generally need to have rc/$X branches. If bug fixes are required after a release $X and the repo has commits that are not desired in the release then they will have an rc/$X branch created at the sha1 of the submodule in ovos-releases at the release tag. Bug fixes will be applied to this branch and the rc/$X branch in ovos-releases will have the submodule sha1 updated. Point release tags would then be made on the rc/$X branch. + +## Feature Branches + +All changes that involve more than one repo should be co-ordinated in a feature branch in ovos-releases. + +This will allow cross-repo pip version dependencies and API changes to be contained in the scope of that branch. + +That feature branch is then added to all repos that need to be modified. + +Once work on the feature branch is complete (ie at least enough that it is accepted into general development) then it can be merged to rc/$R on ovos-releases and this process will merge the feature branches on all submodules to dev too (ie this could be automated). Alternatively the feature branches on all relevant submodules could be merged to dev and then they would automatically be picked up by rc/$R. + +Each feature should have a relevant issue in https://github.com/OpenVoiceOS/ovos-releases/issues to track activity and provide information about the feature. Then the developer can request a feature branch in ovos-releases on the issue. (Because Github doesn't allow a PR to a non-existant branch afaik). + +(See https://github.blog/changelog/2022-03-02-create-a-branch-for-an-issue/ and https://github.com/marketplace/actions/create-issue-branch for ideas on how to simplify this) + +The branch should be named feat/{issue#}_{name} + +Feature branches in ovos-releases are NOT expected to be functional. It may be the case that some submodules have outstanding PRs or the feature may simply be in a WIP status. + +Note: It may be appropriate for breaking changes that only affect one repo to be pushed to a WIP branch in a submodule. This will avoid being pulled into the rc/$R branch until it's ready. This doesn't need to be a feature branch for a single repo but there's no reason it can't be. + +# Updates from submodules + +How does a change in a submodule get accepted into ovos-releases. + +First clone ovos-releases (you're probably doing that anyway) + +1. Normal development on a single repo (eg bug fix, isolated feature) + 1. Work on the dev branch in the submodule + 1. Test and commit changes + 1. Submit PR to submodule repo + 1. PR approved + 1. Updated submodules in ovos-releases + 1. Commit with a suitable message + 1. Submit PR for ovos-releases + + The last 3 steps should be automated when a PR is approved to any submodule dev branches. This automation should appropriately update all feature branches too + +1. Normal development on multiple repos (eg bug fix, distributed feature, pip dependency changes) + 1. Create an issue on ovos-releases for the feature. Note that this can be done at any time should the developer realise that multiple repos are impacted. + 1. Request feat/$F branch in the ovos-releases issue (for each submodule too) + 1. Create and checkout the feature branch (feat/$F) in each submodule. + 1. Work on the feature branch in the submodules + 1. Test and commit changes + 1. Submit PR to each submodule repo for the feat/$F branch + 1. PRs approved + 1. Updated submodules in feat/$F ovos-releases. At this point all non-involved repos are on the 'dev' branch and involved repos are on the feat/$F branch. + + Could we automate on any PR to any submodule on branch == feat/$F + + Note: submodule feature branches must be manually kept up-to-date (rebase etc) with submodule dev branches. + + Note: It would be tricky for normal users to test with multiple features at once as that's complex and would proably need a local merge of feature branches. + +# Release process + +TBD + From c097f6524560836aa2e508fed5f9f6b63167c820 Mon Sep 17 00:00:00 2001 From: David Greaves Date: Sat, 3 Feb 2024 18:41:11 +0000 Subject: [PATCH 4/4] Add an alternate approach with a testing branch Signed-off-by: David Greaves --- README-testing.md | 111 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 README-testing.md diff --git a/README-testing.md b/README-testing.md new file mode 100644 index 0000000..17c02f0 --- /dev/null +++ b/README-testing.md @@ -0,0 +1,111 @@ +# Overview + +This repository contains submodules for all the git repos that form an OVOS release. + +It provides a convenient way for developers to work on OVOS as a whole and a reliable way to define the code contained in a release. + +As such the main use of the ovos-releases repo will be +1. for developers to track ongoing collaborative work by simply pull/updating all submodules +2. for users and/or testers to obtain fixed snapshots of OVOS as a whole. + +This is currently a proposal/wip and is intended to be expanded and refined. + +## Releases +Releases will be represented by a tag in this ovos-releases repo. + +This will identify the exact commit in each submodule that will be used for that release. + +# OVOS individual repository branches + +Individual OVOS repos will have four types of branches: dev, testing, feat/*, WIP/* + +## dev +Normal bug fixing and incremental work +## testing +Tracks dev as closely as possible. Conceptually when tests succeed. dev -> testing PR would be triggered by a human, and can include any number of PRs to dev (eg, feature + bug fixes introduced), once test in that PR pass and reviewers approve it becomes testing. This layer also gives more protection rules, like requiring 2 approvals for testing etc, while dev would not require approvals at all depending on the repo. +## feat/* +As described in ovos-releases +## wip/* +Known breaking development (eg API changes or collaboration branches). + + +# ovos-releases branches + + +There will be three types of branches in ovos-releases: release-candidate (rc/) and feature (feat/). + +## Alpha branch + +The alpha branch is the development branch for and will automatically be kept up-to-date with the dev branches of all submodules. + +## Release branches : rc/$R + +The rc/$R branch is the development branch for working towards release $R and, post-release, for providing point-release updates. + +The rc/$R branch will automatically be kept up-to-date with the testing branches of all submodules. + +Release candidates (testing points) and releases are tagged on the rc/$R branch. + +After a release, the rc/$R+1 branch will be created and will become the new default branch. + +The (now-old) rc/$R-1 branch may have bug fixes applied and subsequent point releases may be tagged along the 'old' rc/$R-1 branch. + +Submodules will not generally need to have rc/$X branches. If bug fixes are required after a release $X and the repo has commits that are not desired in the release then they will have an rc/$X branch created at the sha1 of the submodule in ovos-releases at the release tag. Bug fixes will be applied to this branch and the rc/$X branch in ovos-releases will have the submodule sha1 updated. Point release tags would then be made on the rc/$X branch. + +## Feature Branches + +All changes that involve more than one repo should be co-ordinated in a feature branch in ovos-releases. + +This will allow cross-repo pip version dependencies and API changes to be contained in the scope of that branch. + +That feature branch is then added to all repos that need to be modified. + +Once work on the feature branch is complete (ie at least enough that it is accepted into general development) then it can be merged to rc/$R on ovos-releases and this process will merge the feature branches on all submodules to testing too (ie this could be automated). Alternatively the feature branches on all relevant submodules could be merged to testing and then they would automatically be picked up by rc/$R. + +Each feature should have a relevant issue in https://github.com/OpenVoiceOS/ovos-releases/issues to track activity and provide information about the feature. Then the developer can request a feature branch in ovos-releases on the issue. (Because Github doesn't allow a PR to a non-existant branch afaik). + +(See https://github.blog/changelog/2022-03-02-create-a-branch-for-an-issue/ and https://github.com/marketplace/actions/create-issue-branch for ideas on how to simplify this) + +The branch should be named feat/{issue#}_{name} + +Feature branches in ovos-releases are NOT expected to be functional. It may be the case that some submodules have outstanding PRs or the feature may simply be in a WIP status. + +Note: It may be appropriate for breaking changes that only affect one repo to be pushed to a WIP branch in a submodule. This will avoid being pulled into the rc/$R branch until it's ready. This doesn't need to be a feature branch for a single repo but there's no reason it can't be. + +# Updates from submodules + +How does a change in a submodule get accepted into ovos-releases. + +First clone ovos-releases (you're probably doing that anyway) + +1. Normal development on a single repo (eg bug fix, isolated feature) + 1. Work on the dev branch in the submodule + 1. Test and commit changes + 1. Submit PR to submodule repo + 1. PR approved + 1. Updated submodules in ovos-releases + 1. Commit with a suitable message + 1. Submit PR for ovos-releases + + The last 3 steps should be automated when a PR is approved to any submodule testing branches. This automation should appropriately update all feature branches too + +1. Normal development on multiple repos (eg bug fix, distributed feature, pip dependency changes) + 1. Create an issue on ovos-releases for the feature. Note that this can be done at any time should the developer realise that multiple repos are impacted. + 1. Request feat/$F branch in the ovos-releases issue (for each submodule too) + 1. Create and checkout the feature branch (feat/$F) in each submodule. + 1. Work on the feature branch in the submodules + 1. Test and commit changes + 1. Submit PR to each submodule repo for the feat/$F branch + 1. PRs approved + 1. Updated submodules in feat/$F ovos-releases. At this point all non-involved repos are on the 'testing' branch and involved repos are on the feat/$F branch. + + Could we automate on any PR to any submodule on branch == feat/$F + + Note: submodule feature branches must be manually kept up-to-date (rebase etc) with submodule testing branches. + + Note: It would be tricky for normal users to test with multiple features at once as that's complex and would proably need a local merge of feature branches. + +# Release process + +TBD +