Update CI scripts, Dockerfiles, enable arm64 build again

This commit is contained in:
2021-06-14 14:02:16 -04:00
parent 2f0e999b06
commit 3da2c8cae3
10 changed files with 90 additions and 45 deletions

View File

@@ -2,7 +2,7 @@
VCPKG_ROOT="/vcpkg"
rm *.gz
rm *.gz &>/dev/null
git submodule update --init --recursive
@@ -11,7 +11,6 @@ cmake -DSIST_DEBUG=off -DCMAKE_TOOLCHAIN_FILE="${VCPKG_ROOT}/scripts/buildsystem
make -j $(nproc)
strip sist2
./sist2 -v > VERSION
cp sist2 Docker/
mv sist2 sist2-x64-linux
rm -rf CMakeFiles CMakeCache.txt

View File

@@ -2,12 +2,12 @@
VCPKG_ROOT="/vcpkg"
rm *.gz
rm *.gz &>/dev/null
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 4
make -j $(nproc)
strip sist2
mv sist2 sist2-arm64-linux