diff options
| author | Taylor Smith <tsmith@tsmithcreative.com> | 2017-10-04 08:43:05 +0300 |
|---|---|---|
| committer | Taylor Smith <tsmith@tsmithcreative.com> | 2017-10-04 08:48:32 +0300 |
| commit | dd252401b188147416125aa001925e1065db009b (patch) | |
| tree | 1564a62154828b6dedc254f339c4b3a45947c711 | |
| parent | a2ecc8de4e3eea56a1374e625ff3dd60551d93e5 (diff) | |
The Windows build failing on mingw repo location in origin repo Dockerfile; patch on build
| -rw-r--r-- | win/opensuse-mingw-repo-location.patch | 13 | ||||
| -rwxr-xr-x | win/travis-build.sh | 9 |
2 files changed, 22 insertions, 0 deletions
diff --git a/win/opensuse-mingw-repo-location.patch b/win/opensuse-mingw-repo-location.patch new file mode 100644 index 0000000..834598a --- /dev/null +++ b/win/opensuse-mingw-repo-location.patch @@ -0,0 +1,13 @@ +diff --git a/admin/win/docker/Dockerfile b/admin/win/docker/Dockerfile +index 8e40a49..1629b97 100644 +--- a/admin/win/docker/Dockerfile ++++ b/admin/win/docker/Dockerfile +@@ -8,7 +8,7 @@ ENV HOME /root + ENV REFRESHED_AT 20160421 + + RUN zypper --non-interactive --gpg-auto-import-keys refresh +-RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_42.1/windows:mingw.repo ++RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_Leap_42.1/windows:mingw.repo + RUN zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/repositories/isv:ownCloud:toolchains:mingw:win32:2.3/openSUSE_Leap_42.1/isv:ownCloud:toolchains:mingw:win32:2.3.repo + RUN zypper --non-interactive --gpg-auto-import-keys install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \ + mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \ diff --git a/win/travis-build.sh b/win/travis-build.sh index ec05dc2..3dcae9a 100755 --- a/win/travis-build.sh +++ b/win/travis-build.sh @@ -29,6 +29,15 @@ if [ "$TRAVIS_BUILD_STEP" == "install" ]; then PPA=ppa:ivaradi/nextcloud-client-exp fi + # @TODO: This patch updates the repo location of mingw _in the origin repo_ + # because repositories/windows:/mingw/openSUSE_42.1/windows:mingw.repo does not + # exist anymore but it does exist in openSUSE Leap 42.1. This should be removed + # and the patch deleted when it is no longer needed to build. + cd client + patch -p1 < ../win/opensuse-mingw-repo-location.patch + cd .. + # /end patch + elif [ "$TRAVIS_BUILD_STEP" == "script" ]; then read basever kind <<<$(linux/debian/scripts/git2changelog.py /tmp/tmpchangelog stable) |