Compare commits

..

2 Commits

Author SHA1 Message Date
c6fee7f6e2 update argparse 2021-06-13 09:41:18 -04:00
201c2a1a47 Update CI things 2021-06-13 09:26:27 -04:00
5 changed files with 38 additions and 38 deletions

View File

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

View File

@ -8,7 +8,7 @@ platform:
steps: steps:
- name: build - name: build
image: simon987/ubuntu_ci image: simon987/sist2-build
commands: commands:
- ./ci/build.sh - ./ci/build.sh
- name: docker - name: docker
@ -19,8 +19,8 @@ steps:
password: password:
from_secret: DOCKER_PASSWORD from_secret: DOCKER_PASSWORD
repo: simon987/sist2 repo: simon987/sist2
context: ./Docker/ context: ./
dockerfile: ./Docker/Dockerfile dockerfile: ./Dockerfile
auto_tag: true auto_tag: true
auto_tag_suffix: x64-linux auto_tag_suffix: x64-linux
when: when:
@ -41,32 +41,32 @@ steps:
source: source:
- ./VERSION - ./VERSION
- ./sist2-x64-linux - ./sist2-x64-linux
- ./sist2-x64-linux-debug.tar.gz - ./sist2-x64-linux-debug
--- #---
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

1
.gitignore vendored
View File

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

View File

@ -8,7 +8,7 @@ git submodule update --init --recursive
rm -rf CMakeFiles CMakeCache.txt rm -rf CMakeFiles CMakeCache.txt
cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" . cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
make -j 33 make -j $(nproc)
strip sist2 strip sist2
./sist2 -v > VERSION ./sist2 -v > VERSION
cp sist2 Docker/ cp sist2 Docker/
@ -16,7 +16,5 @@ mv sist2 sist2-x64-linux
rm -rf CMakeFiles CMakeCache.txt rm -rf CMakeFiles CMakeCache.txt
cmake -DSIST_DEBUG=on -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" . cmake -DSIST_DEBUG=on -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" .
make -j 33 make -j $(nproc)
cp /usr/lib/x86_64-linux-gnu/libasan.so.2.0.0 libasan.so.2
mv sist2_debug sist2-x64-linux-debug mv sist2_debug sist2-x64-linux-debug
tar -czf sist2-x64-linux-debug.tar.gz sist2-x64-linux-debug libasan.so.2

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