diff --git a/.travis.yml b/.travis.yml index 837a0977..feaf403e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ matrix: dotnet: 2.2 os: linux dist: xenial - sudo: required - services: docker - name: "OSX Qt 5.12.0" dotnet: 2.2.101 os: osx @@ -16,4 +14,4 @@ if: tag IS blank git: depth: false script: - - ./build/travis.sh + - ./build/travis.sh \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index e33a93d8..80fb1322 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,8 @@ image: Visual Studio 2017 before_build: - - ps: Invoke-WebRequest -Uri https://github.com/qmlnet/qmlnet/releases/download/ci/qt-5.12-windows-x64.zip -OutFile C:\qt.zip - - cmd: 7z x C:\qt.zip -oC:\Qt5120 + - ps: Invoke-WebRequest -Uri https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.12.2-de3f7b1-win-x64-dev.tar.gz -OutFile C:\qmlnet-qt.tar.gz + - cmd: 7z x C:\qmlnet-qt.tar.gz -oC:\ + - cmd: 7z x C:\qmlnet-qt.tar -oC:\qmlnet-qt - cmd: rm -r C:\Tools\GitVersion\ - cmd: dotnet tool install -g GitVersion.Tool --version 4.0.1-beta1-58 - cmd: dotnet gitversion > version.json @@ -9,4 +10,4 @@ before_build: build_script: - cmd: build/appveyor.bat after_build: - - ps: Get-ChildItem output\*.nupkg | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } + - ps: Get-ChildItem output\*.nupkg | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } \ No newline at end of file diff --git a/build/appveyor.bat b/build/appveyor.bat index bd3d22af..1e90bfc0 100644 --- a/build/appveyor.bat +++ b/build/appveyor.bat @@ -1,8 +1,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" -set PATH=%PATH%;C:\Qt5120\Qt\5.12.0\msvc2017_64\bin -set PATH=%PATH%;C:\Qt5120\Qt\Tools\QtCreator\bin +set PATH=%PATH%;C:\qmlnet-qt\qt\bin +set PATH=%PATH%;C:\qmlnet-qt\Tools\QtCreator\bin set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\src\native\output - dotnet run -p ./build/scripts/Build.csproj -- ci \ No newline at end of file diff --git a/build/docker/README.md b/build/docker/README.md deleted file mode 100644 index 3ff6b924..00000000 --- a/build/docker/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Docker images used for different purposes. - -* linux-ci - Used for Linux CI (Travis) -* windows-cross - Contains static qt5 libs for Windows (cross compilation). \ No newline at end of file diff --git a/build/docker/build-all.sh b/build/docker/build-all.sh deleted file mode 100755 index 5287be76..00000000 --- a/build/docker/build-all.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) - -$SCRIPT_DIR/build-linux-ci.sh -$SCRIPT_DIR/build-windows-cross.sh \ No newline at end of file diff --git a/build/docker/build-linux-ci.sh b/build/docker/build-linux-ci.sh deleted file mode 100755 index 58b62f87..00000000 --- a/build/docker/build-linux-ci.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -e - -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) - -docker build \ - --build-arg QT_VERSION=5.12.0 \ - -t qmlnet/linux-ci:qt-5.12.0 \ - $SCRIPT_DIR/linux-ci \ No newline at end of file diff --git a/build/docker/build-windows-cross.sh b/build/docker/build-windows-cross.sh deleted file mode 100755 index e9249397..00000000 --- a/build/docker/build-windows-cross.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) - -docker build $SCRIPT_DIR/windows-cross \ - -t net-core-qml-windows-cross \ No newline at end of file diff --git a/build/docker/linux-ci/Dockerfile b/build/docker/linux-ci/Dockerfile deleted file mode 100644 index 68195c1c..00000000 --- a/build/docker/linux-ci/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:16.04 - -ARG QT_VERSION - -ADD install-packages.sh / -RUN /install-packages.sh && rm /install-packages.sh - -ADD install-dotnet.sh / -RUN /install-dotnet.sh && rm /install-dotnet.sh - -ADD install-qt.sh / -RUN /install-qt.sh && rm /install-qt.sh - -ENV QT_PLUGIN_PATH=/Qt/$QT_VERSION/gcc_64/plugins -ENV QML2_IMPORT_PATH=/Qt/$QT_VERSION/gcc_64/qml - -RUN mkdir /work -WORKDIR /work \ No newline at end of file diff --git a/build/docker/linux-ci/install-dotnet.sh b/build/docker/linux-ci/install-dotnet.sh deleted file mode 100755 index db2d5602..00000000 --- a/build/docker/linux-ci/install-dotnet.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -e - -apt-get update -wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb -dpkg -i packages-microsoft-prod.deb -apt-get install -y apt-transport-https -apt-get update -apt-get install -y dotnet-sdk-2.2 -apt-get clean \ No newline at end of file diff --git a/build/docker/linux-ci/install-packages.sh b/build/docker/linux-ci/install-packages.sh deleted file mode 100755 index 605b33f3..00000000 --- a/build/docker/linux-ci/install-packages.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -set -e - -apt-get update -apt-get install -y build-essential \ - apt-transport-https \ - git \ - p7zip-full \ - curl \ - wget \ - libgl1-mesa-dev \ - libfontconfig1 \ - libglib2.0-0 \ - libgtk-3-0 -apt-get clean diff --git a/build/docker/linux-ci/install-qt.sh b/build/docker/linux-ci/install-qt.sh deleted file mode 100755 index 71ee0158..00000000 --- a/build/docker/linux-ci/install-qt.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -set -e - -curl -L https://github.com/pauldotknopf/Qml.Net/releases/download/ci/qt-${QT_VERSION}-linux-x64.tar.gz -o - \ - | tar -xzpf - -C / - -echo -e '#!/usr/bin/env bash\nexec /Qt/'"${QT_VERSION}"'/gcc_64/bin/qmake $*' > /usr/bin/qmake -chmod +x /usr/bin/qmake \ No newline at end of file diff --git a/build/docker/linux-ci/install.sh b/build/docker/linux-ci/install.sh deleted file mode 100755 index 685acbc1..00000000 --- a/build/docker/linux-ci/install.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e - -/install-packages.sh -/install-dotnet.sh -/install-qt.sh \ No newline at end of file diff --git a/build/docker/windows-cross/Dockerfile b/build/docker/windows-cross/Dockerfile deleted file mode 100644 index f2b2fb44..00000000 --- a/build/docker/windows-cross/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update -RUN apt-get install -y git - -RUN apt-get install -y \ - build-essential \ - g++-mingw-w64-x86-64 \ - gcc-mingw-w64-x86-64 - -ENV QT_SRC_DIR=/qt-work -ENV QT_PREFIX=/usr/local - -ADD qtbase.sh / -#RUN ./qtbase.sh && rm -rf $QT_SRC_DIR - diff --git a/build/docker/windows-cross/qtbase.sh b/build/docker/windows-cross/qtbase.sh deleted file mode 100755 index c9757823..00000000 --- a/build/docker/windows-cross/qtbase.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -set -e -set -x - -mkdir -p $QT_SRC_DIR - -cd $QT_SRC_DIR -git clone --branch v5.11.1 --depth 1 https://github.com/qt/qtbase.git -cd $QT_SRC_DIR/qtbase - -./configure -release \ - -c++std c++11 \ - -release \ - -static \ - -opensource \ - -confirm-license \ - -opengl desktop \ - -xplatform win32-g++ \ - -prefix $QT_PREFIX \ - -device-option CROSS_COMPILE=/usr/bin/x86_64-w64-mingw32- \ - -nomake examples \ - -nomake tests \ - -skip qtwebengine \ - -verbose - -make -j 4 -make install \ No newline at end of file diff --git a/build/travis.linux.sh b/build/travis.linux.sh index 2d4c11aa..9800482a 100755 --- a/build/travis.linux.sh +++ b/build/travis.linux.sh @@ -1,11 +1,14 @@ #!/usr/bin/env bash SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +QT_DIR=$SCRIPT_DIR/Qt -docker run -it --rm \ - -v $SCRIPT_DIR/../:/work \ - -w /work \ - -e LD_LIBRARY_PATH=/work/src/native/output \ - -e PRIVATE_NUGET_KEY=$PRIVATE_NUGET_KEY \ - qmlnet/linux-ci:qt-5.12.0 \ - ./build.sh ci \ No newline at end of file +sudo apt-get install -y libgl1-mesa-dev + +mkdir -p $QT_DIR +wget -O- -q https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.12.2-de3f7b1-linux-x64-dev.tar.gz | tar xpz -C $QT_DIR + +export PATH=$QT_DIR/qt/bin:$PATH +export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/src/native/output + +$TRAVIS_BUILD_DIR/build.sh ci \ No newline at end of file diff --git a/build/travis.osx.sh b/build/travis.osx.sh index b63df276..8d21cd29 100755 --- a/build/travis.osx.sh +++ b/build/travis.osx.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash -set -ex +set -e SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) QT_DIR=$SCRIPT_DIR/Qt mkdir -p $QT_DIR -wget -O- -q https://github.com/qmlnet/qmlnet/releases/download/ci/qt-5.12-osx-x64.tar.gz | tar xpz -C $QT_DIR +wget -O- -q https://github.com/qmlnet/qt-runtimes/releases/download/releases/qt-5.12.2-de3f7b1-osx-x64-dev.tar.gz | tar xpz -C $QT_DIR -export PATH=$PATH:$QT_DIR/Qt/5.12.0/clang_64/bin +export PATH=$QT_DIR/qt/bin:$PATH export DYLD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/src/native/output # We need to source this script, so that DYLD_LIBRARY_PATH get's passed.