From 6a854550ae276835fa8e3cc65e1bd677c1d2dcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aki=20V=C3=A4nttinen?= Date: Sat, 10 Aug 2024 23:57:38 +0300 Subject: [PATCH] attempted fix to build failing --- .github/workflows/python-actions.yml | 2 +- test/Dockerfile_python-sc2 | 33 +++++----------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/.github/workflows/python-actions.yml b/.github/workflows/python-actions.yml index 5be4d220..c5b13152 100644 --- a/.github/workflows/python-actions.yml +++ b/.github/workflows/python-actions.yml @@ -85,5 +85,5 @@ jobs: # docker exec --interactive app1 bash -c "python python-sc2/test/travis_test_script.py" # could use matrix here to provide the bots and map - docker exec -i app1 bash -c "python run_custom.py -p1 ${{ matrix.player1 }} -p2 ${{ matrix.player2 }} --map AcolyteLE --requirewin 1" + docker exec -i app1 bash -c "python run_custom.py -p1 ${{ matrix.player1 }} -p2 ${{ matrix.player2 }} --map Equilibrium513AIE --requirewin 1" docker rm -f app1 diff --git a/test/Dockerfile_python-sc2 b/test/Dockerfile_python-sc2 index cd4b17f5..b64d7c5b 100644 --- a/test/Dockerfile_python-sc2 +++ b/test/Dockerfile_python-sc2 @@ -51,35 +51,14 @@ RUN ln -s /root/StarCraftII/Maps /root/StarCraftII/maps \ # Change to maps folder WORKDIR /root/StarCraftII/maps/ -# Maps are available here https://github.com/Blizzard/s2client-proto#map-packs and here http://wiki.sc2ai.net/Ladder_Maps +# Maps are available here https://github.com/Blizzard/s2client-proto#map-packs and here https://aiarena.net/wiki/maps/ # Download and uncompress StarCraftII Maps, remove zip file - using "maps" instead of "Maps" as target folder -# Get sc2ai.net ladder maps -RUN wget --quiet --show-progress --progress=bar:force \ - http://archive.sc2ai.net/Maps/Season1Maps.zip \ - http://archive.sc2ai.net/Maps/Season2Maps.zip \ - http://archive.sc2ai.net/Maps/Season3Maps.zip \ - http://archive.sc2ai.net/Maps/Season4Maps.zip \ - http://archive.sc2ai.net/Maps/Season5Maps.zip \ - http://archive.sc2ai.net/Maps/Season6Maps.zip \ - http://archive.sc2ai.net/Maps/Season7Maps.zip \ - http://archive.sc2ai.net/Maps/Season8Maps.zip \ - http://archive.sc2ai.net/Maps/Season9Maps.zip \ - http://archive.sc2ai.net/Maps/Season10Maps.zip \ - && unzip -q -o '*.zip' \ - && rm *.zip - -# Get official blizzard maps -RUN wget --quiet --show-progress --progress=bar:force http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season3.zip \ - && unzip -q -P iagreetotheeula -o 'Ladder2019Season3.zip' \ - && mv Ladder2019Season3/* . \ - && rm Ladder2019Season3.zip \ - && rm -r Ladder2019Season3 - -# Get v5.0.6 maps -RUN wget --quiet --show-progress --progress=bar:force https://github.com/shostyn/sc2patch/raw/master/Maps/506.zip \ - && unzip -q -o '506.zip' \ - && rm 506.zip +# Get 5.13 maps +RUN wget --quiet --show-progress --progress=bar:force https://aiarena.net/wiki/184/plugin/attachments/download/39/ \ + && unzip -q -o '5.13.zip' \ + && rm 5.13.zip + # Remove LE suffix from file names RUN rename -v 's/LE.SC2Map/.SC2Map/' *.SC2Map