From 4b58cc3f83aeefa1398153c604dd1fabc895938e Mon Sep 17 00:00:00 2001 From: Garux Date: Sat, 22 Jul 2023 23:26:18 +0600 Subject: [PATCH] omit SVN requirement with DOWNLOAD_GAMEPACKS=no this is to workaround github actions build error: svn.exe is present, but access returns code 127 --- .github/workflows/build.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ca23889..19b4edad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: msys2/setup-msys2@v2 with: - install: ${{ matrix.prefix }}-qt5-base ${{ matrix.prefix }}-libxml2 svn git + install: ${{ matrix.prefix }}-qt5-base ${{ matrix.prefix }}-libxml2 git msystem: ${{ matrix.msystem }} path-type: minimal release: false diff --git a/Makefile b/Makefile index 648c284a..3bd218b8 100644 --- a/Makefile +++ b/Makefile @@ -337,7 +337,7 @@ dependencies-check: checkbinary pkg-config "$(PKGCONFIG)"; \ checkbinary unzip "$(UNZIPPER)"; \ checkbinary git-core "$(GIT)"; \ - checkbinary subversion "$(SVN)"; \ + [ "$(DOWNLOAD_GAMEPACKS)" = "yes" ] || [ "$(DOWNLOAD_GAMEPACKS)" = "all" ] && checkbinary subversion "$(SVN)"; \ checkbinary wget "$(WGET)"; \ [ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \ [ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \