From 30b1541afd802031fccd81b87f8242eff519726b Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Tue, 5 May 2020 14:20:02 +0200 Subject: [PATCH] Use the relative path workaround in the workflow --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e8ae4a2..3f4b176f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,13 +63,13 @@ jobs: install - name: Build the binaries run: | - # I'm not sure why, but on Ubuntu 18.04 the path to the wrap patch - # files is relative to the current working directory rather than the - # build directory - sed -i 's#file:\.\./subprojects#file:./subprojects#' subprojects/*.wrap - - meson setup --buildtype=release --cross-file cross-wine.conf -Duse-bitbridge=true build - ninja -C build + # Ubuntu resolves the relative paths used in the meson wrap files + # relatively to the current working directory, so we have to setup the + # project directly from the build directory + mkdir build + cd build + meson setup --buildtype=release --cross-file ../cross-wine.conf -Duse-bitbridge=true + ninja - name: Create an archive for the binaries run: | set -e