(experiment) create zip for Linux and remove osx deps from travis

This commit is contained in:
Peter Squicciarini
2020-09-18 17:02:52 -07:00
parent 608edd6776
commit a8d355c276
2 changed files with 24 additions and 29 deletions

View File

@@ -24,6 +24,7 @@ script:
- ./build.sh - ./build.sh
before_deploy: before_deploy:
- ./create_zip.sh
- ./sum.sh - ./sum.sh
deploy: deploy:

View File

@@ -1,14 +1,9 @@
#!/bin/bash #!/bin/bash
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo apt-get update
curl -Lo $HOME/bin/jq --create-dirs https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx-amd64 sudo apt-get install -y fakeroot jq
chmod +x $HOME/bin/jq triplet=
export PATH="$HOME/bin:$PATH" case $BUILDARCH in
else
sudo apt-get update
sudo apt-get install -y fakeroot jq
triplet=
case $BUILDARCH in
arm) arm)
arch=armhf arch=armhf
triplet=arm-linux-gnueabihf triplet=arm-linux-gnueabihf
@@ -18,9 +13,9 @@ else
arch=arm64 arch=arm64
triplet=aarch64-linux-gnu triplet=aarch64-linux-gnu
;; ;;
esac esac
if [[ -n "$triplet" ]]; then if [[ -n "$triplet" ]]; then
sed 's/^deb /deb [arch=amd64] '/g -i /etc/apt/sources.list sed 's/^deb /deb [arch=amd64] '/g -i /etc/apt/sources.list
echo "deb [arch=$arch] http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/$arch.list >/dev/null echo "deb [arch=$arch] http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/$arch.list >/dev/null
sudo dpkg --add-architecture $arch sudo dpkg --add-architecture $arch
@@ -36,7 +31,6 @@ else
export CC_host=/usr/bin/gcc export CC_host=/usr/bin/gcc
export CXX_host=/usr/bin/g++ export CXX_host=/usr/bin/g++
export PKG_CONFIG_LIBDIR=/usr/lib/$triplet/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig export PKG_CONFIG_LIBDIR=/usr/lib/$triplet/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
else else
sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev rpm sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev rpm
fi
fi fi