Browse Source

Update carla, delete old travis stuff

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.4.2
falkTX 1 year ago
parent
commit
2104216ee3
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
5 changed files with 2 additions and 119 deletions
  1. +0
    -73
      .travis.yml
  2. +0
    -17
      .travis/before_install.sh
  3. +0
    -27
      .travis/install.sh
  4. +1
    -1
      Carla
  5. +1
    -1
      PawPaw

+ 0
- 73
.travis.yml View File

@@ -1,73 +0,0 @@
language: cpp

os: linux

dist: focal

cache:
directories:
- ${HOME}/PawPawBuilds/builds
- ${HOME}/PawPawBuilds/debs
- ${HOME}/PawPawBuilds/downloads
- ${HOME}/PawPawBuilds/targets/macos
- ${HOME}/PawPawBuilds/targets/macos-universal
- ${HOME}/PawPawBuilds/targets/win32
- ${HOME}/PawPawBuilds/targets/win64

env:
global:
- BOOTSTRAP_VERSION=4

jobs:
# linux with win32 cross-compilation
- name: "win32 cross-compiled"
os: linux
compiler: gcc
env:
- TARGET="win32"
services:
- xvfb

# linux with win64 cross-compilation
- name: "win64 cross-compiled"
os: linux
compiler: gcc
env:
- TARGET="win64"
services:
- xvfb

# macOS native intel build
- name: "macOS native intel"
os: osx
osx_image: xcode9.4
env:
- TARGET="macos"

# macOS universal build
- name: "macOS universal"
os: osx
osx_image: xcode12.3
env:
- TARGET="macos-universal"

before_install:
- bash ${TRAVIS_BUILD_DIR}/.travis/before_install.sh

install:
- bash ${TRAVIS_BUILD_DIR}/.travis/install.sh

script:
- bash ${TRAVIS_BUILD_DIR}/build.sh ${TARGET}

deploy:
provider: releases
api_key:
secure: "afKJTgVeXjuOSTqnkvYBK129dwgIhfEuw98DmCDmEeW/+IeUBZC1PtnvlDAxxsqExZgdCi1i+8fRzdFGQS6GpNx6IZzIZs/DETR0XjNdtf6gZLwnCC98OskqG724P0qlW+DJFU4cfje7iYw75UbDEFlTosgFqIeNC0oBi1APTIQM3AtfyK5HqGCqRORzQBuBoE7JaJDTiY31W1hiXhJrUZZVP9ne5Gxl81SeOEUUrofaP91z4BBifr9ffZyFONdJTjBv3UnKyajDoORZkgE97hknLVaXMkOTKRmA4BIFbu0ag0/TW/8JGyEca/uQFX14LS1qWRNoLVajaWiZrHlo4qwznQE4S2jGWu1vMitbqqlkNG2ps75Qs45KoKluBo5hwoe6LNUn8aIacji+pEe+JTGOHArWgnPP5qJpDQgDy2HhINxEU0aFm89vJWaavWwQmDEDpwrcpa81mOG5XCMlpAVBcqfXU35j/mxT/nn7eLnCAnxXgayS81AovlbBJTZf9F8XVoK+XlMUwuL5Dk56SfnSGIXEGLgrdxSwkKMr3lRiDzIB9lzv7U/QXlvX/6n3YwW9GucsVa5C1I79t4FOFIX1xNUzj7No2EwnTSiQfte8GmfGw0SuqRM6SKd6JnQvISZ5zx+/NEKODMPWrFPRy9uluChr9t5KUOmC9HNFdUU="
file_glob: true
file:
- Carla/*.dmg
- Carla/*.zip
skip_cleanup: true
on:
tags: true

+ 0
- 17
.travis/before_install.sh View File

@@ -1,17 +0,0 @@
#!/bin/bash

set -e

if [ "${TARGET}" = "macos" ] || [ "${TARGET}" = "macos-universal" ]; then
exit 0
fi

if [ "${TARGET}" = "win32" ] || [ "${TARGET}" = "win64" ]; then
wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main'
sudo dpkg --add-architecture i386
fi

sudo apt-get update -qq
sudo apt-get install -y -o APT::Immediate-Configure=false libc6 libc6:i386 libgcc-s1:i386
sudo apt-get install -y -f

+ 0
- 27
.travis/install.sh View File

@@ -1,27 +0,0 @@
#!/bin/bash

set -e

# Special macOS native handling
if [ "${TARGET}" = "macos" ] || [ "${TARGET}" = "macos-universal" ]; then
HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake jq meson
exit 0
fi

# Special handling for caching deb archives
if [ "$(ls ${HOME}/PawPawBuilds/debs | wc -l)" -ne 0 ]; then
sudo cp ${HOME}/PawPawBuilds/debs/*.deb /var/cache/apt/archives/
fi

# common
sudo apt-get install -y build-essential curl cmake jq llvm mingw-w64 qttools5-dev-tools winehq-stable

# specific
if [ "${TARGET}" = "win32" ]; then
sudo apt-get install -y binutils-mingw-w64-i686 g++-mingw-w64-i686
elif [ "${TARGET}" = "win64" ]; then
sudo apt-get install -y binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
fi

# Special handling for caching deb archives
sudo mv /var/cache/apt/archives/*.deb ${HOME}/PawPawBuilds/debs/

+ 1
- 1
Carla

@@ -1 +1 @@
Subproject commit c397f32066d6b58ac37cc68de780398e766a0966
Subproject commit 8d0f5af4efa1754bba4c12a33489156dccdb3f39

+ 1
- 1
PawPaw

@@ -1 +1 @@
Subproject commit b41a693b64cdba1abd8d278c9985fb690b522854
Subproject commit b54d0246597b1aae28b28ff734bef6e740758c55

Loading…
Cancel
Save