Merge pull request #1243 from FarmBot/nerves_hub_removal

v12.0.0
FarmBot · Sep 18, 2020 · ef0f862 · ef0f862
2 parents 8688d32 + 64eb092
commit ef0f862
Show file tree

Hide file tree

Showing 53 changed files with 3,694 additions and 4,510 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,13 +26,6 @@ install_arduino: &install_arduino
     name: Run setup script
     command: bash .circleci/setup-arduino.sh
 
-install_slack_helpers: &install_slack_helpers
-  run:
-    name: Install Slack Helpers
-    command: |
-      wget https://gist.githubusercontent.com/ConnorRigby/03e722be4be70f8588f5ed74420e4eaa/raw/28a51d8f52ec7d569e8f7f20b83349816ddf63cf/slack_message.ex
-      cp .circleci/fwup_meta_slack.sh /usr/bin/
-
 install_ghr: &install_ghr
   run:
     name: Install ghr (Github Releases)
@@ -142,7 +135,7 @@ build_firmware_clean_steps: &build_firmware_clean_steps
         paths:
           - "/nerves/deploy/system"
 
-deploy_nerves_hub_firmware_steps: &deploy_nerves_hub_firmware_steps
+deploy_ota_firmware_steps: &deploy_ota_firmware_steps
   steps:
     - checkout
     - run: git submodule update --init --recursive
@@ -158,20 +151,6 @@ deploy_nerves_hub_firmware_steps: &deploy_nerves_hub_firmware_steps
     - <<: *install_elixir
     - <<: *install_hex_archives
     - <<: *install_jq
-    - <<: *install_slack_helpers
-    - run:
-        name: Sign Image
-        working_directory: /nerves/build/farmbot_os
-        command: |
-          mix deps.get
-          mix nerves_hub.firmware sign --key notreal /nerves/deploy/system/artifacts/farmbot-${MIX_TARGET}-$(cat ../VERSION).fw
-    - run:
-        name: Publish to NervesHub
-        working_directory: /nerves/build/farmbot_os
-        command: mix nerves_hub.firmware publish --deploy ${NERVES_HUB_DEPLOY} ${NERVES_HUB_TTL} /nerves/deploy/system/artifacts/farmbot-${MIX_TARGET}-$(cat ../VERSION).fw
-    - run:
-        name: Send Slack Message
-        command: ./.circleci/fwup_meta_slack.sh -i /nerves/deploy/system/artifacts/farmbot-${MIX_TARGET}-$(cat VERSION).fw
 
 jobs:
 
@@ -432,8 +411,8 @@ jobs:
     environment:
       MIX_TARGET: rpi
       MIX_ENV: prod
-      NERVES_HUB_DEPLOY: rpi-prod-stable
-    <<: *deploy_nerves_hub_firmware_steps
+      OTA_DEPLOY: rpi-prod-stable
+    <<: *deploy_ota_firmware_steps
 
 ################################################################################
 #                    target=rpi3 app_env=prod channel=stable                   #
@@ -444,8 +423,8 @@ jobs:
     environment:
       MIX_TARGET: rpi3
       MIX_ENV: prod
-      NERVES_HUB_DEPLOY: rpi3-prod-stable
-    <<: *deploy_nerves_hub_firmware_steps
+      OTA_DEPLOY: rpi3-prod-stable
+    <<: *deploy_ota_firmware_steps
 
 ################################################################################
 #                    target=rpi app_env=prod channel=beta                      #
@@ -456,9 +435,7 @@ jobs:
     environment:
       MIX_TARGET: rpi
       MIX_ENV: prod
-      NERVES_HUB_DEPLOY: rpi-prod-beta
-      NERVES_HUB_TTL: "--ttl 3600"
-    <<: *deploy_nerves_hub_firmware_steps
+    <<: *deploy_ota_firmware_steps
 
 ################################################################################
 #                     target=rpi3 app_env=prod channel=beta                    #
@@ -469,9 +446,7 @@ jobs:
     environment:
       MIX_TARGET: rpi3
       MIX_ENV: prod
-      NERVES_HUB_DEPLOY: rpi3-prod-beta
-      NERVES_HUB_TTL: "--ttl 3600"
-    <<: *deploy_nerves_hub_firmware_steps
+    <<: *deploy_ota_firmware_steps
 
 ################################################################################
 #                     target=rpi3 app_env=prod channel=staging                 #
@@ -482,9 +457,8 @@ jobs:
     environment:
       MIX_TARGET: rpi3
       MIX_ENV: prod
-      NERVES_HUB_DEPLOY: rpi3-prod-staging
-      NERVES_HUB_TTL: "--ttl 900"
-    <<: *deploy_nerves_hub_firmware_steps
+      OTA_DEPLOY: rpi3-prod-staging
+    <<: *deploy_ota_firmware_steps
 
 ################################################################################
 #                     target=rpi3 app_env=prod channel=qa                      #
@@ -495,9 +469,8 @@ jobs:
     environment:
       MIX_TARGET: rpi3
       MIX_ENV: prod
-      NERVES_HUB_DEPLOY: rpi3-prod-qa
-      NERVES_HUB_TTL: "--ttl 900"
-    <<: *deploy_nerves_hub_firmware_steps
+      OTA_DEPLOY: rpi3-prod-qa
+    <<: *deploy_ota_firmware_steps
 
 ################################################################################
 #                     target=rpi app_env=prod channel=qa                       #
@@ -508,9 +481,8 @@ jobs:
     environment:
       MIX_TARGET: rpi
       MIX_ENV: prod
-      NERVES_HUB_DEPLOY: rpi-prod-qa
-      NERVES_HUB_TTL: "--ttl 900"
-    <<: *deploy_nerves_hub_firmware_steps
+      OTA_DEPLOY: rpi-prod-qa
+    <<: *deploy_ota_firmware_steps
 
 ################################################################################
 #                TARGET FIRMWARE NERVES GITHUB RELEASE BETA                    #
@@ -536,7 +508,6 @@ jobs:
       - <<: *install_elixir
       - <<: *install_hex_archives
       - <<: *install_ghr
-      - <<: *install_slack_helpers
       - <<: *install_jq
       - add_ssh_keys:
           fingerprints:
@@ -560,12 +531,6 @@ jobs:
       - run:
           name: Publish Github Release
           command: ./ghr -t $GITHUB_TOKEN -u farmbot -r farmbot_os -prerelease -recreate -prerelease -b "$(cat RELEASE_NOTES)" -c $(git rev-parse --verify HEAD) "v$(cat VERSION)" /nerves/deploy/system/artifacts/
-      - run:
-          name: Slack message
-          command: |
-            export OTA_URL=$(wget https://api.github.com/repos/farmbot/farmbot_os/releases -qO- | jq '.[0].url' | sed -e 's/^"//' -e 's/"$//')
-            export SLACK_MESSAGE="New Farmbot Beta: $OTA_URL"
-            elixir slack_message.ex $SLACK_MESSAGE
 
 ################################################################################
 #               TARGET FIRMWARE NERVES GITHUB RELEASE MASTER                   #
@@ -591,7 +556,6 @@ jobs:
       - <<: *install_elixir
       - <<: *install_hex_archives
       - <<: *install_ghr
-      - <<: *install_slack_helpers
       - add_ssh_keys:
           fingerprints:
             - "97:92:32:5d:d7:96:e1:fa:f3:6b:f3:bd:d6:aa:84:c6"
@@ -614,9 +578,6 @@ jobs:
       - run:
           name: Publish Github Release
           command: ./ghr -t $GITHUB_TOKEN -u farmbot -r farmbot_os -recreate -prerelease -draft -delete -b "$(cat RELEASE_NOTES)" -c $(git rev-parse --verify HEAD) "v$(cat VERSION)" /nerves/deploy/system/artifacts
-      - run:
-          name: Send Slack Message
-          command: elixir slack_message.ex "New Farmbot Prod release $(cat VERSION)"
 
 workflows:
   version: 2
@@ -674,7 +635,7 @@ workflows:
                 - /^qa\/.*/
 
   # master branch to staging.farmbot.io
-  nerves_hub_prod_stable_staging:
+  ota_prod_stable_staging:
     jobs:
       - build_clean_rpi_prod:
           context: farmbot-staging
@@ -698,7 +659,7 @@ workflows:
             - build_clean_rpi3_prod
 
   # master branch to my.farmbot.io
-  nerves_hub_prod_stable_production:
+  ota_prod_stable_production:
     jobs:
       - build_clean_rpi_prod:
           context: farmbot-production
@@ -727,7 +688,7 @@ workflows:
             - build_clean_rpi3_prod
 
   # any tag containint an `-rcXXX` tag to staging.farmbot.io
-  nerves_hub_prod_beta_staging:
+  ota_prod_beta_staging:
     jobs:
       - build_rpi_prod:
           context: farmbot-staging
@@ -763,7 +724,7 @@ workflows:
             - build_rpi3_prod
 
   # any tag containint an `-rcXXX` tag to my.farmbot.io
-  nerves_hub_prod_beta_production:
+  ota_prod_beta_production:
     jobs:
       - build_rpi_prod:
           context: farmbot-production
@@ -809,7 +770,7 @@ workflows:
             - build_rpi3_prod
 
   # any branch matching qa/** to staging.farmbot.io
-  nerves_hub_prod_staging_staging:
+  ota_prod_staging_staging:
     jobs:
       - build_rpi3_prod:
           context: farmbot-staging
@@ -844,7 +805,7 @@ workflows:
             - build_rpi_prod
 
   # any branch matching qa/** to production.farmbot.io
-  nerves_hub_prod_staging_production:
+  ota_prod_staging_production:
     jobs:
       - build_rpi3_prod:
           context: farmbot-production

diff --git a/.circleci/fwup_meta_slack.sh b/.circleci/fwup_meta_slack.sh
diff --git a/.gitignore b/.gitignore
@@ -52,7 +52,6 @@ RELEASE_NOTES
 .make_state
 
 .elixir_ls
-nerves-hub
 *.pem
 *.db
 *.db-journal

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# 12.0.0
+
+ * Migrate OTA system to an in-house solution.
+ * Express v1.0 firmware updates.
+ * Fix bug where sequences would crash when a `coordinate` is passed as a variable (Thanks, @jsimmonds2).
+
 # 11.1.0
 
  * Bug fix related to usage of tools in MOVE block.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,4 +1,3 @@
 # Contributing
-To get started, <a href="https://www.clahub.com/agreements/FarmBot/farmbot_os">sign the Contributor License Agreement</a>.
 
-After that, read through the [documentation](docs/index.md) 
+Please read through the [documentation](docs/index.md)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-11.1.0
+12.0.0
diff --git a/docs/glossary.md b/docs/glossary.md
@@ -30,9 +30,6 @@ This file contains a basic glossary of commonly used terms
 * Nerves - Framework that allows cross compilation of Elixir code
   * [More info](https://nerves-project.org/)
   * [Docs](https://hexdocs.pm/nerves/getting-started.html)
-* NervesHub - Cloud based firmware management
-  * [More info](https://www.nerves-hub.org/)
-  * [Docs](https://github.com/nerves-hub/documentation)
 * Firmware - Usually refers to the code that gets deployed onto the Raspberry Pi
 
 ## OTP Terms