Skip to content

Commit

Permalink
omit SVN requirement with DOWNLOAD_GAMEPACKS=no
Browse files Browse the repository at this point in the history
this is to workaround github actions build error: svn.exe is present, but access returns code 127
  • Loading branch information
Garux committed Jul 22, 2023
1 parent 68c604d commit 4b58cc3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"; \
Expand Down

0 comments on commit 4b58cc3

Please sign in to comment.