Merge branch 'development' of github.com:pi-hole/FTL into arm-qemu-2

Signed-off-by: Adam Hill <adam@diginc.us>
ewpratten · Nov 12, 2019 · 6092d61 · 6092d61
2 parents 7599734 + dcafd2e
commit 6092d61
Show file tree

Hide file tree

Showing 123 changed files with 19,204 additions and 14,007 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,22 +13,24 @@ version: 2
         command: |
           BRANCH=$([ -z "$CIRCLE_TAG" ] && echo "$CIRCLE_BRANCH" || echo "master")
           [[ $CIRCLE_JOB == *"qemu"* ]] && DOCKERIFNEEDED="docker run --rm -v $(pwd):/workspace -w /workspace pihole/ftl-build:arm-qemu "
-          $DOCKERIFNEEDED make GIT_BRANCH="${BRANCH}" GIT_TAG="${CIRCLE_TAG}"
+          $DOCKERIFNEEDED make GIT_BRANCH="${BRANCH}" GIT_TAG="${CIRCLE_TAG}" STATIC="${STATIC}"
           file pihole-FTL
     - run:
         name: "Upload"
         command: |
-          [[ "$CIRCLE_PR_NUMBER" != "" ]] && exit 0
-          [[ "$CIRCLE_USERNAME" != "pi-hole" ]] && exit 0
-          FOLDER=$([ -z "$CIRCLE_TAG" ] && echo "$CIRCLE_BRANCH" || echo "$CIRCLE_TAG")
+          [[ -z "$FTL_SECRET" || "$CIRCLE_PR_NUMBER" != "" || "$CIRCLE_USERNAME" != "pi-hole" ]] && exit 0
+          DIR="${CIRCLE_TAG:-${CIRCLE_BRANCH}}"
           mv pihole-FTL "${BIN_NAME}"
           sha1sum pihole-FTL-* > ${BIN_NAME}.sha1
-          wget https://ftl.pi-hole.net:8080/FTL-client
-          chmod +x ./FTL-client
-          ./FTL-client "${FOLDER}" "${BIN_NAME}" "${FTL_SECRET}"
-          ./FTL-client "${FOLDER}" "${BIN_NAME}.sha1" "${FTL_SECRET}"
-          rm ./FTL-client
-          ls -lah .
+          mkdir -p ~/.ssh/
+          ssh-keyscan -H $SSH_HOST >> ~/.ssh/known_hosts
+          sftp -b - $SSH_USER@$SSH_HOST <<< "-mkdir ${DIR}
+          put ${BIN_NAME}* ${DIR}"
+          mv "${BIN_NAME}" pihole-FTL
+    - run:
+        name: "Test"
+        command: |
+          test/run.sh
 
 .docker_template: &docker_template
   docker:
@@ -97,7 +99,10 @@ workflows:
           filters:
             tags:
               only: /^v.*/
-#      - x86_64-musl
+      - x86_64-musl:
+          filters:
+            tags:
+              only: /^v.*/
       - x86_32:
           filters:
             tags:

diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,10 @@
-# Generated binary files
-/obj/
-/dnsmasq/obj
+# Object files output by the assembler
+/build
+
+# Generated binary
 pihole-FTL
-socket-test
 
-# Versioning files
+# Versioning files (generated by Makefile)
 version*
 
 # CMake files
@@ -14,13 +14,8 @@ version*
 # IDE files
 .idea/
 *.sw*
+.vscode/
 
-# Test-generated files
-/pihole.log
-/pihole-FTL.conf
-/pihole-FTL.db
-/pihole-FTL.log
-
-# aux files
-aux/manuf.data
-aux/macvendor.db
+# MAC->Vendor database files
+tools/manuf.data
+tools/macvendor.db
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "test/libs/bats"]
-	path = test/libs/bats
-	url = https://github.com/sstephenson/bats
-[submodule "test/libs/bats-support"]
-	path = test/libs/bats-support
-	url = https://github.com/ztombol/bats-support