删除网页server标签

adamswsk · Oct 26, 2021 · 949bc7a · 949bc7a
1 parent 3ace484
commit 949bc7a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -436,13 +436,13 @@ jobs:
           fingerprints:
             - "b0:9a:68:cf:70:33:1e:d2:27:c7:d7:0b:dc:86:74:4a"
       - run: echo $FWUP_KEY_BASE64 | base64 --decode --ignore-garbage > $NERVES_FW_PRIV_KEY
-      - run:
-          name: Sign rpi3 Firmware and create image
-          command: |
-            # mv /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).fw /tmp/farmbot-rpi3-$(cat VERSION).fw
-            # fwup -S -s $NERVES_FW_PRIV_KEY -i /tmp/farmbot-rpi3-$(cat VERSION).fw -o /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).fw
-            fwup -a -t complete -i /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).fw -d /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).img
-            sha256sum /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).img > /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).sha256
+      #- run:
+      #    name: Sign rpi3 Firmware and create image
+      #    command: |
+      #      # mv /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).fw /tmp/farmbot-rpi3-$(cat VERSION).fw
+      #      # fwup -S -s $NERVES_FW_PRIV_KEY -i /tmp/farmbot-rpi3-$(cat VERSION).fw -o /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).fw
+      #      fwup -a -t complete -i /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).fw -d /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).img
+      #      sha256sum /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).img > /nerves/deploy/system/artifacts/farmbot-rpi3-$(cat VERSION).sha256
       - run:
           name: Sign rpi Firmware and create image
           command: |
@@ -498,23 +498,23 @@ workflows:
               only:
                 - staging
                 - /^qa\/.*/
-      - build_fresh_rpi3:
-          context: org-global
-          filters:
-            branches:
-              only:
-                - staging
-                - /^qa\/.*/
+      #- build_fresh_rpi3:
+      #    context: org-global
+      #    filters:
+      #      branches:
+      #        only:
+      #          - staging
+      #          - /^qa\/.*/
       - predeploy_rpi:
           context: org-global
           requires:
             - build_fresh_rpi
-      - predeploy_rpi3:
-          context: org-global
-          requires:
-            - build_fresh_rpi3
+      #- predeploy_rpi3:
+      #    context: org-global
+      #    requires:
+      #      - build_fresh_rpi3
       - release_to_github:
           context: org-global
           requires:
             - build_fresh_rpi
-            - build_fresh_rpi3
+     #      - build_fresh_rpi3
diff --git a/farmbot_os/priv/static/templates/credentials.html.eex b/farmbot_os/priv/static/templates/credentials.html.eex
@@ -32,8 +32,8 @@
                 onclick="showPassword()" title="Show password">
             </div>
 
-            <label for="server"> Server </label>
-            <input value="<%= server %>" type="url" name=server required></p>
+            <!--<label for="server"> Server </label>
+            <input value="<%= server %>" type="url" name=server required></p>-->
           </fieldset>
           <div>
             <b>WARNING:</b>

diff --git a/farmbot_os/test/farmbot_os/configurator/router_test.exs b/farmbot_os/test/farmbot_os/configurator/router_test.exs
@@ -321,7 +321,7 @@ defmodule FarmbotOS.Configurator.RouterTest do
     params = %{
       "email" => "[email protected]",
       "password" => "password123",
-      "server" => "https://my.farm.bot"
+      "server" => "http://111.229.7.173:3000"
     }
 
     conn =
@@ -331,7 +331,7 @@ defmodule FarmbotOS.Configurator.RouterTest do
     assert redirected_to(conn) == "/finish"
     assert get_session(conn, "auth_config_email") == "[email protected]"
     assert get_session(conn, "auth_config_password") == "password123"
-    assert get_session(conn, "auth_config_server") == "https://my.farm.bot"
+    assert get_session(conn, "auth_config_server") == "http://111.229.7.173:3000"
 
     conn =
       conn(:post, "/configure_credentials", %{