diff --git a/dependencies.sh b/dependencies.sh index a3a0c091cdd..1c8c717ff77 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -21,5 +21,7 @@ export NODE_VERSION_PRECISE=14.16.1 echo "NODE_VERSION_PRECISE=$NODE_VERSION_PRECISE" >> "$GITHUB_ENV" # Python version for mapmerge and other tools -export PYTHON_VERSION=3.9.18 +# Ensure in https://www.python.org/ftp/python/ there is a file called python--embed-amd64.zip, +# that's what the mapmerge2 script looks for +export PYTHON_VERSION=3.9.13 echo "PYTHON_VERSION=$PYTHON_VERSION" >> "$GITHUB_ENV" diff --git a/html/changelogs/fluffyghost-mapmerge2windowsfix.yml b/html/changelogs/fluffyghost-mapmerge2windowsfix.yml new file mode 100644 index 00000000000..d8716ab8c7f --- /dev/null +++ b/html/changelogs/fluffyghost-mapmerge2windowsfix.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Set the python version so that there is a release for windows, for mapmerge2."