From 201c2a1a47c41e5132c40c8b4879a5d364227b8b Mon Sep 17 00:00:00 2001
From: simon987 <me@simon987.net>
Date: Sun, 13 Jun 2021 09:26:27 -0400
Subject: [PATCH] Update CI things

---
 .dockerignore |  3 ++-
 .drone.yml    | 62 +++++++++++++++++++++++++--------------------------
 .gitignore    |  1 +
 ci/build.sh   |  8 +++----
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 571043a..431b3ae 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -20,4 +20,5 @@ third-party/libscan/libscan-test-files/
 **/ext_ffmpeg
 **/ext_libmobi
 **/scan_a_test
-Dockerfile
\ No newline at end of file
+Dockerfile
+*.idx/
diff --git a/.drone.yml b/.drone.yml
index b56731d..1b2ed2d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ platform:
 
 steps:
   - name: build
-    image: simon987/ubuntu_ci
+    image: simon987/sist2-build
     commands:
       - ./ci/build.sh
   - name: docker
@@ -19,8 +19,8 @@ steps:
       password:
         from_secret: DOCKER_PASSWORD
       repo: simon987/sist2
-      context: ./Docker/
-      dockerfile: ./Docker/Dockerfile
+      context: ./
+      dockerfile: ./Dockerfile
       auto_tag: true
       auto_tag_suffix: x64-linux
       when:
@@ -41,32 +41,32 @@ steps:
       source:
         - ./VERSION
         - ./sist2-x64-linux
-        - ./sist2-x64-linux-debug.tar.gz
+        - ./sist2-x64-linux-debug
 
----
-kind: pipeline
-type: docker
-name: arm64
-
-platform:
-  arch: arm64
-
-steps:
-  - name: build
-    image: simon987/ubuntu_ci_arm
-    commands:
-      - ./ci/build_arm64.sh
-  - name: scp files
-    image: appleboy/drone-scp
-    settings:
-      host:
-        from_secret: SSH_HOST
-      port:
-        from_secret: SSH_PORT
-      user:
-        from_secret: SSH_USER
-      key:
-        from_secret: SSH_KEY
-      target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/arm_${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
-      source:
-        - ./sist2-arm64-linux
+#---
+#kind: pipeline
+#type: docker
+#name: arm64
+#
+#platform:
+#  arch: arm64
+#
+#steps:
+#  - name: build
+#    image: simon987/ubuntu_ci_arm
+#    commands:
+#      - ./ci/build_arm64.sh
+#  - name: scp files
+#    image: appleboy/drone-scp
+#    settings:
+#      host:
+#        from_secret: SSH_HOST
+#      port:
+#        from_secret: SSH_PORT
+#      user:
+#        from_secret: SSH_USER
+#      key:
+#        from_secret: SSH_KEY
+#      target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/arm_${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
+#      source:
+#        - ./sist2-arm64-linux
diff --git a/.gitignore b/.gitignore
index eb4db54..471fda9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ bundle.js
 vgcore.*
 build/
 third-party/
+*.idx/
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
index 91c3df8..0333686 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -8,7 +8,7 @@ git submodule update --init --recursive
 
 rm -rf CMakeFiles CMakeCache.txt
 cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
-make -j 33
+make -j $(nproc)
 strip sist2
 ./sist2 -v > VERSION
 cp sist2 Docker/
@@ -16,7 +16,5 @@ mv sist2 sist2-x64-linux
 
 rm -rf CMakeFiles CMakeCache.txt
 cmake -DSIST_DEBUG=on -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
-make -j 33
-cp /usr/lib/x86_64-linux-gnu/libasan.so.2.0.0 libasan.so.2
-mv sist2_debug sist2-x64-linux-debug
-tar -czf sist2-x64-linux-debug.tar.gz sist2-x64-linux-debug libasan.so.2
+make -j  $(nproc)
+mv sist2_debug sist2-x64-linux-debug
\ No newline at end of file