From 05cdb9c3ab9ed68e694f52a1b22b38923c6185a6 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Fri, 14 Sep 2018 07:22:49 +0100 Subject: [PATCH 01/22] Add Vagrant Config for Lniux Test VM For testing linux build steps. --- .gitignore | 1 + Vagrantfile | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Vagrantfile diff --git a/.gitignore b/.gitignore index 754681b..0bec2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ bin/ build/ obj/ +.vagrant/ diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..e3f6814 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,13 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : +Vagrant.configure(2) do |config| + config.vm.box = "ubuntu/bionic64" + + config.vm.synced_folder ".", "/home/vagrant/shared/" + + config.vm.provision "shell", inline: <<-SHELL + sudo apt-get update + sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev + sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + SHELL +end From 7561e133f6f57e2cd745b1d7015306fe85925e46 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Fri, 14 Sep 2018 07:25:03 +0100 Subject: [PATCH 02/22] Add `arm64` Toolchain File This is used to tell CMake how to compile with the arm cross compiler. --- .gitignore | 1 + arm64.toolchain | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 arm64.toolchain diff --git a/.gitignore b/.gitignore index 0bec2d6..0a05646 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ bin/ build/ obj/ .vagrant/ +*.log diff --git a/arm64.toolchain b/arm64.toolchain new file mode 100644 index 0000000..a6bcc2e --- /dev/null +++ b/arm64.toolchain @@ -0,0 +1,10 @@ +set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_PROCESSOR arm) + +set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc) +set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++) + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) From 1a31d72d6a8660f9481eacfca1c77479711dcdd5 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 14:13:32 +0100 Subject: [PATCH 03/22] Setup for Multi-RID Builds Add the ability to target more than one runtime identifier. --- build.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index 5d910cf..5d044a3 100755 --- a/build.sh +++ b/build.sh @@ -7,11 +7,11 @@ set -e # Work out the platform we are building on, and the RID which goes # along with it. case `uname` in - Darwin) rid="osx" + Darwin) rids=("osx-x64") platform="Mac" ;; # TODO: Linux needs more than one target RID - Linux) rid="linux" + Linux) rids=("linux-x64") platform="Linux" ;; *) echo "Unrecognised platform `uname`" 1>&2 @@ -19,15 +19,18 @@ case `uname` in ;; esac -# log out the RID decided on -echo "Compiling for $rid on $platform" +for rid in "$rids" +do + # log out the RID decided on + echo "Compiling for $rid on $platform" -# Build the webview library -rm -rf build/$rid/ -mkdir -p build/$rid -(cd build/$rid && \ - cmake -D BUILD_SHARED_LIBS=ON ../../webview/ && \ - make ) + # Build the webview library + rm -rf build/$rid/ + mkdir -p build/$rid + (cd build/$rid && \ + cmake -D BUILD_SHARED_LIBS=ON ../../webview/ && \ + make) +done # Pack it all up dotnet pack -c Release Webview.Batteries.$platform.csproj From 8c0fd26c049af09e2121523aec854c7b03e960b8 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 14:27:21 +0100 Subject: [PATCH 04/22] Allow RIDs to Specify CMake Toolchain The idea is that we can conditionally change the toolchain for cross compiling. Still need to work out how to properly install the dependencies when compiling for arm64. --- build.sh | 15 +++++++++++---- arm64.toolchain => linux-arm64.toolchain | 0 2 files changed, 11 insertions(+), 4 deletions(-) rename arm64.toolchain => linux-arm64.toolchain (100%) diff --git a/build.sh b/build.sh index 5d044a3..4c25bf5 100755 --- a/build.sh +++ b/build.sh @@ -11,7 +11,7 @@ case `uname` in platform="Mac" ;; # TODO: Linux needs more than one target RID - Linux) rids=("linux-x64") + Linux) rids=("linux-x64" "linux-arm64") platform="Linux" ;; *) echo "Unrecognised platform `uname`" 1>&2 @@ -27,9 +27,16 @@ do # Build the webview library rm -rf build/$rid/ mkdir -p build/$rid - (cd build/$rid && \ - cmake -D BUILD_SHARED_LIBS=ON ../../webview/ && \ - make) + + # If we have a toolchain file, then use that + if [ -f $rid.toolchain ] + then + (cd build/$rid && cmake -DCMAKE_TOOLCHAIN_FILE=../../$rid.toolchain -D BUILD_SHARED_LIBS=ON ../../webview/) + else + (cd build/$rid && cmake -D BUILD_SHARED_LIBS=ON ../../webview/) + fi + + (cd build/$rid && make) done # Pack it all up diff --git a/arm64.toolchain b/linux-arm64.toolchain similarity index 100% rename from arm64.toolchain rename to linux-arm64.toolchain From 683a074233aa3dfcfbdc31734238e8edb3a79e3a Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 14:43:01 +0100 Subject: [PATCH 05/22] Run Build Script with Bash on Unix Using the legacy `sh` was causing build failures. :-/ --- ci_build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_build.ps1 b/ci_build.ps1 index 30c7f49..4e1f248 100644 --- a/ci_build.ps1 +++ b/ci_build.ps1 @@ -4,7 +4,7 @@ # appropriate platform-specific build script. if ($PSVersionTable.Platform -eq "Unix") { - sh ./build.sh + bash ./build.sh } else { From 3efdad58eb2eb2ea29fa9de918f2d9f2ae0f05c8 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 14:53:18 +0100 Subject: [PATCH 06/22] Add `arm64` Linux to Project File Update the project file to add the second runtime identifier. --- Webview.Batteries.Linux.csproj | 9 ++++++--- build.sh | 12 ++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Webview.Batteries.Linux.csproj b/Webview.Batteries.Linux.csproj index 30adb28..2bbd82b 100644 --- a/Webview.Batteries.Linux.csproj +++ b/Webview.Batteries.Linux.csproj @@ -11,9 +11,12 @@ - - - runtimes\linux\native\libwebview.so + + runtimes\linux-x64\native\libwebview.so + true + + + runtimes\linux-arm64\native\libwebview.so true diff --git a/build.sh b/build.sh index 4c25bf5..3a31000 100755 --- a/build.sh +++ b/build.sh @@ -24,19 +24,23 @@ do # log out the RID decided on echo "Compiling for $rid on $platform" - # Build the webview library + # Clean build directory rm -rf build/$rid/ mkdir -p build/$rid + pushd build/$rid # If we have a toolchain file, then use that if [ -f $rid.toolchain ] then - (cd build/$rid && cmake -DCMAKE_TOOLCHAIN_FILE=../../$rid.toolchain -D BUILD_SHARED_LIBS=ON ../../webview/) + cmake -DCMAKE_TOOLCHAIN_FILE=../../$rid.toolchain -D BUILD_SHARED_LIBS=ON ../../webview/ || exit 1 else - (cd build/$rid && cmake -D BUILD_SHARED_LIBS=ON ../../webview/) + cmake -D BUILD_SHARED_LIBS=ON ../../webview/ || exit 1 fi - (cd build/$rid && make) + # Build the webview library + make || exit 1 + + popd done # Pack it all up From 42be63a1485470934b25c176ddb9e869c9d184d6 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 15:01:55 +0100 Subject: [PATCH 07/22] Attempt to Fix Loop over Runtime Identifiers Looks like the previous code wasn't properly looping. Hopefully this works a bit better. --- build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 3a31000..9740d52 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,6 @@ case `uname` in Darwin) rids=("osx-x64") platform="Mac" ;; - # TODO: Linux needs more than one target RID Linux) rids=("linux-x64" "linux-arm64") platform="Linux" ;; @@ -19,7 +18,7 @@ case `uname` in ;; esac -for rid in "$rids" +for rid in ${rids[@]} do # log out the RID decided on echo "Compiling for $rid on $platform" From e72df4d5ad4feeec5b57b333bd6bc5f2b914f005 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 15:09:23 +0100 Subject: [PATCH 08/22] Fixup Path to Toolchain File Update the path to the toolchain file now that `pushd` is being used. Adds a dump of `file` for each build output. --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 9740d52..6194dab 100755 --- a/build.sh +++ b/build.sh @@ -29,7 +29,7 @@ do pushd build/$rid # If we have a toolchain file, then use that - if [ -f $rid.toolchain ] + if [ -f ../../$rid.toolchain ] then cmake -DCMAKE_TOOLCHAIN_FILE=../../$rid.toolchain -D BUILD_SHARED_LIBS=ON ../../webview/ || exit 1 else @@ -38,6 +38,7 @@ do # Build the webview library make || exit 1 + file libwebview.* popd done From 45cf0adeb4372d1bd9a1d567917f063820f4c41e Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 15:16:07 +0100 Subject: [PATCH 09/22] Add Compiler to Appveyor File Arm toolchain install. --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index c2658f8..5189f13 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ image: - ubuntu install: - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev + - sh: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - git submodule update --init --recursive build_script: - ps: .\ci_build.ps1 From 597221a66e932bbb345b0dddc426fffd7d7cc520 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 15:39:06 +0100 Subject: [PATCH 10/22] Try Installing Dependencies for `arm64` Add another line of dependencies to the `appveyor.yml` file. I don't hold out much hope that this will 'just work'. --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 5189f13..277528a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ image: - ubuntu install: - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev + - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 - sh: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - git submodule update --init --recursive build_script: From f7153347e338e27da30811d9fdabd07beefbeaa0 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 16:24:47 +0100 Subject: [PATCH 11/22] Move Dependency Install into Build Script Need to uninstall the dependencies from the amd64 build before installing the arm64 ones. Better to move this into a script. --- appveyor.yml | 1 - build.sh | 6 ++++++ linux-arm64-install.sh | 26 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 linux-arm64-install.sh diff --git a/appveyor.yml b/appveyor.yml index 277528a..5189f13 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,6 @@ image: - ubuntu install: - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev - - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 - sh: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - git submodule update --init --recursive build_script: diff --git a/build.sh b/build.sh index 6194dab..f058823 100755 --- a/build.sh +++ b/build.sh @@ -23,6 +23,12 @@ do # log out the RID decided on echo "Compiling for $rid on $platform" + # If we have a custom install script then run that + if [ -f $rid-install.sh ] + then + bash $rid-install.sh || exit 1 + fi + # Clean build directory rm -rf build/$rid/ mkdir -p build/$rid diff --git a/linux-arm64-install.sh b/linux-arm64-install.sh new file mode 100755 index 0000000..d7200e7 --- /dev/null +++ b/linux-arm64-install.sh @@ -0,0 +1,26 @@ +#! /usr/bin/env bash + +set -e + +## CI Dependency install script for arm 64 + +# Remove the existing libraries, these conflict when instlaling +sudo apt-get purge -y libwebkit2gtk-4.0-dev libgtk-3-dev + +# Add the arm64 architecture +echo > webview.list < Date: Sun, 16 Sep 2018 16:31:52 +0100 Subject: [PATCH 12/22] Squash Errors from `apt-get update` Fingers crossed we can just ignore the 404 errors from some package feeds. --- linux-arm64-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-arm64-install.sh b/linux-arm64-install.sh index d7200e7..df99094 100755 --- a/linux-arm64-install.sh +++ b/linux-arm64-install.sh @@ -20,7 +20,7 @@ EOF sudo mv webview.list /etc/apt/sources.list.d sudo dpkg --add-architecture arm64 -sudo apt-get update +sudo apt-get update || true # Add the dependencies for our chosen architecture sudo apt-get install -y libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 \ No newline at end of file From 48f3324653ca19c1882b53617cbee109bedb9eec Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 16:38:04 +0100 Subject: [PATCH 13/22] Nuclear Option Remove the existing sources list. --- linux-arm64-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-arm64-install.sh b/linux-arm64-install.sh index df99094..62bf5eb 100755 --- a/linux-arm64-install.sh +++ b/linux-arm64-install.sh @@ -18,6 +18,7 @@ deb [arch=arm64] http://ports.ubuntu.com/ bionic-updates multiverse deb [arch=arm64] http://ports.ubuntu.com/ bionic-backports main restricted universe multiverse EOF sudo mv webview.list /etc/apt/sources.list.d +sudo mv /etc/apt/sources.list /etc/apt/sources.list.bk sudo dpkg --add-architecture arm64 sudo apt-get update || true From 8be635e1b26df8fea38af450b091ce3709072a7d Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 17:02:10 +0100 Subject: [PATCH 14/22] Package Fixlings Updates the sources list file with `sed` rather than the more drastic option. Fixes the creation of the temporary list file by switching from `echo` to `cat`. --- linux-arm64-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-arm64-install.sh b/linux-arm64-install.sh index 62bf5eb..4ccd09e 100755 --- a/linux-arm64-install.sh +++ b/linux-arm64-install.sh @@ -8,7 +8,7 @@ set -e sudo apt-get purge -y libwebkit2gtk-4.0-dev libgtk-3-dev # Add the arm64 architecture -echo > webview.list < webview.list < Date: Sun, 16 Sep 2018 17:10:18 +0100 Subject: [PATCH 15/22] Needs More Purge! Hopefully fully uninstalling the depeendencies will allow for installation of the xross dependencies. --- linux-arm64-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-arm64-install.sh b/linux-arm64-install.sh index 4ccd09e..ef1ea6d 100755 --- a/linux-arm64-install.sh +++ b/linux-arm64-install.sh @@ -5,7 +5,7 @@ set -e ## CI Dependency install script for arm 64 # Remove the existing libraries, these conflict when instlaling -sudo apt-get purge -y libwebkit2gtk-4.0-dev libgtk-3-dev +sudo apt-get purge --auto-remove -y libwebkit2gtk-4.0-dev libgtk-3-dev # Add the arm64 architecture cat > webview.list < Date: Sun, 16 Sep 2018 17:43:01 +0100 Subject: [PATCH 16/22] Install Gtk+ --- Vagrantfile | 2 +- appveyor.yml | 2 +- linux-arm64-install.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index e3f6814..4c0e0bb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,7 +7,7 @@ Vagrant.configure(2) do |config| config.vm.provision "shell", inline: <<-SHELL sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev + sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk+-3-dev sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu SHELL end diff --git a/appveyor.yml b/appveyor.yml index 5189f13..408963c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ image: - Visual Studio 2017 - ubuntu install: - - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev + - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk+-3-dev - sh: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - git submodule update --init --recursive build_script: diff --git a/linux-arm64-install.sh b/linux-arm64-install.sh index ef1ea6d..0ccc723 100755 --- a/linux-arm64-install.sh +++ b/linux-arm64-install.sh @@ -5,7 +5,7 @@ set -e ## CI Dependency install script for arm 64 # Remove the existing libraries, these conflict when instlaling -sudo apt-get purge --auto-remove -y libwebkit2gtk-4.0-dev libgtk-3-dev +sudo apt-get purge --auto-remove -y libwebkit2gtk-4.0-dev libgtk+-3-dev # Add the arm64 architecture cat > webview.list < Date: Sun, 16 Sep 2018 17:57:59 +0100 Subject: [PATCH 17/22] Set SYSROOT --- linux-arm64.toolchain | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-arm64.toolchain b/linux-arm64.toolchain index a6bcc2e..5f55b3d 100644 --- a/linux-arm64.toolchain +++ b/linux-arm64.toolchain @@ -1,6 +1,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR arm) +set(CMAKE_SYSROOT /usr/aarch64-linux-gnu) + set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc) set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++) From bf7778bb827f1a0d79c532fb3d33b6f2bfd383bf Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 18:10:24 +0100 Subject: [PATCH 18/22] Re-Write Morre Apt Lists --- linux-arm64-install.sh | 3 ++- linux-arm64.toolchain | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/linux-arm64-install.sh b/linux-arm64-install.sh index 0ccc723..e86c1a0 100755 --- a/linux-arm64-install.sh +++ b/linux-arm64-install.sh @@ -17,8 +17,9 @@ deb [arch=arm64] http://ports.ubuntu.com/ bionic multiverse deb [arch=arm64] http://ports.ubuntu.com/ bionic-updates multiverse deb [arch=arm64] http://ports.ubuntu.com/ bionic-backports main restricted universe multiverse EOF -sudo mv webview.list /etc/apt/sources.list.d +sudo sed -ibk /etc/apt/sources.list.d/*.list -e 's/deb http/deb [arch=amd64] http/g' sudo sed -ibk /etc/apt/sources.list -e 's/deb http/deb [arch=amd64] http/g' +sudo mv webview.list /etc/apt/sources.list.d sudo dpkg --add-architecture arm64 sudo apt-get update diff --git a/linux-arm64.toolchain b/linux-arm64.toolchain index 5f55b3d..a6bcc2e 100644 --- a/linux-arm64.toolchain +++ b/linux-arm64.toolchain @@ -1,8 +1,6 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR arm) -set(CMAKE_SYSROOT /usr/aarch64-linux-gnu) - set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc) set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++) From 81f67f89cff47c873ddac2ac412e693dac4ddd02 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 18:37:42 +0100 Subject: [PATCH 19/22] Try Full Paths to Compilers --- Vagrantfile | 2 +- appveyor.yml | 2 +- linux-arm64-install.sh | 4 ++-- linux-arm64.toolchain | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 4c0e0bb..e3f6814 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,7 +7,7 @@ Vagrant.configure(2) do |config| config.vm.provision "shell", inline: <<-SHELL sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk+-3-dev + sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu SHELL end diff --git a/appveyor.yml b/appveyor.yml index 408963c..5189f13 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ image: - Visual Studio 2017 - ubuntu install: - - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk+-3-dev + - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev - sh: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - git submodule update --init --recursive build_script: diff --git a/linux-arm64-install.sh b/linux-arm64-install.sh index e86c1a0..97445c7 100755 --- a/linux-arm64-install.sh +++ b/linux-arm64-install.sh @@ -5,7 +5,7 @@ set -e ## CI Dependency install script for arm 64 # Remove the existing libraries, these conflict when instlaling -sudo apt-get purge --auto-remove -y libwebkit2gtk-4.0-dev libgtk+-3-dev +sudo apt-get purge --auto-remove -y libwebkit2gtk-4.0-dev libgtk-3-dev # Add the arm64 architecture cat > webview.list < Date: Sun, 16 Sep 2018 18:52:25 +0100 Subject: [PATCH 20/22] What is Held? --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 5189f13..a8a92be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,8 +4,10 @@ image: - Visual Studio 2017 - ubuntu install: + - sh: sudo apt-mark showhold - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev - sh: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + - sh: sudo apt-mark showhold - git submodule update --init --recursive build_script: - ps: .\ci_build.ps1 From f15a8f3e9927dbbfc874590bca063b6e867cb3c5 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 18:58:27 +0100 Subject: [PATCH 21/22] Unintall Powershell --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a8a92be..fe86ba1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,10 +4,9 @@ image: - Visual Studio 2017 - ubuntu install: - - sh: sudo apt-mark showhold + - sh: sudo apt-get remove -f -y powershell - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev - sh: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - - sh: sudo apt-mark showhold - git submodule update --init --recursive build_script: - ps: .\ci_build.ps1 From 6cadbf40575bce0e6e2eb086783997310ca50f28 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sun, 16 Sep 2018 19:32:55 +0100 Subject: [PATCH 22/22] Triplicate --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fe86ba1..b37eab6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ image: - Visual Studio 2017 - ubuntu install: - - sh: sudo apt-get remove -f -y powershell + - sh: sudo apt-get remove -f -y --allow-change-held-packages powershell - sh: sudo apt-get install -y libwebkit2gtk-4.0-dev libgtk-3-dev - sh: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - git submodule update --init --recursive