.dockerignore

@@ -21,4 +21,3 @@ third-party/libscan/libscan-test-files/
 **/ext_libmobi
 **/scan_a_test
 Dockerfile
-*.idx/

.drone.yml

@@ -8,7 +8,7 @@ platform:
 
 steps:
   - name: build
-    image: simon987/sist2-build
+    image: simon987/ubuntu_ci
     commands:
       - ./ci/build.sh
   - name: docker
@@ -19,8 +19,8 @@ steps:
       password:
         from_secret: DOCKER_PASSWORD
       repo: simon987/sist2
-      context: ./
+      context: ./Docker/
-      dockerfile: ./Dockerfile
+      dockerfile: ./Docker/Dockerfile
       auto_tag: true
       auto_tag_suffix: x64-linux
       when:
@@ -41,32 +41,32 @@ steps:
       source:
         - ./VERSION
         - ./sist2-x64-linux
-        - ./sist2-x64-linux-debug
+        - ./sist2-x64-linux-debug.tar.gz
 
-#---
+---
-#kind: pipeline
+kind: pipeline
-#type: docker
+type: docker
-#name: arm64
+name: arm64
-#
+
-#platform:
+platform:
-#  arch: arm64
+  arch: arm64
-#
+
-#steps:
+steps:
-#  - name: build
+  - name: build
-#    image: simon987/ubuntu_ci_arm
+    image: simon987/ubuntu_ci_arm
-#    commands:
+    commands:
-#      - ./ci/build_arm64.sh
+      - ./ci/build_arm64.sh
-#  - name: scp files
+  - name: scp files
-#    image: appleboy/drone-scp
+    image: appleboy/drone-scp
-#    settings:
+    settings:
-#      host:
+      host:
-#        from_secret: SSH_HOST
+        from_secret: SSH_HOST
-#      port:
+      port:
-#        from_secret: SSH_PORT
+        from_secret: SSH_PORT
-#      user:
+      user:
-#        from_secret: SSH_USER
+        from_secret: SSH_USER
-#      key:
+      key:
-#        from_secret: SSH_KEY
+        from_secret: SSH_KEY
-#      target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/arm_${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
+      target: /files/sist2/${DRONE_REPO_OWNER}_${DRONE_REPO_NAME}/arm_${DRONE_BRANCH}_${DRONE_BUILD_NUMBER}_${DRONE_COMMIT}/
-#      source:
+      source:
-#        - ./sist2-arm64-linux
+        - ./sist2-arm64-linux

.gitignore

@@ -16,4 +16,3 @@ bundle.js
 vgcore.*
 build/
 third-party/
-*.idx/

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 $(nproc)
+make -j 33
 strip sist2
 ./sist2 -v > VERSION
 cp sist2 Docker/
@@ -16,5 +16,7 @@ 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  $(nproc)
+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

third-party/argparse

@@ -1 +1 @@
-Subproject commit ffd9c23427d0cb105e27f27f0cf97b463b6a8bf8
+Subproject commit 5957da0b44d485657edc863b0b924fe837e67b27