diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c65db20..15b9497 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Jobs to build the two channels in Socializer. variables: - PYTHON3: "C:\\python37\\python.exe" - PYINSTALLER: "C:\\python37\\scripts\\pyinstaller.exe" + PYTHON3-32: "C:\\python38-32\\python.exe" + PYTHON3-64: "C:\\python38-32\\python.exe" PYTHON2: "C:\\python27\\python.exe" NSIS: "C:\\nsis\\makensis.exe" @@ -10,15 +10,15 @@ test_py3: tags: - windows10 before_script: - - '%PYTHON3% -V' - - '%PYTHON3% -m pip install --upgrade pip' - - '%PYTHON3% -m pip install --upgrade -r requirements.txt' + - '%PYTHON3-32% -v' + - '%PYTHON3-32% -m pip install --upgrade pip' + - '%PYTHON3-32% -m pip install --upgrade -r requirements.txt' only: - schedules script: - cd src - - '%PYTHON3% -m coverage run run_tests.py' - - '%PYTHON3% -m coverage report --omit="test*"' + - '%PYTHON3-32% -m coverage run run_tests.py' + - '%PYTHON3-32% -m coverage report --omit="test*"' coverage: '/TOTAL.+ ([0-9]{1,3}%)/' documentation: @@ -26,7 +26,7 @@ documentation: tags: - windows10 before_script: - - '%PYTHON3% -v' + - '%PYTHON3-32% -v' script: - copy changelog.md doc\changelog.md - cd doc @@ -47,21 +47,21 @@ alpha_python3: tags: - windows10 before_script: - - '%PYTHON3% -v' - - '%PYTHON3% -m pip install --upgrade pip' - - '%PYTHON3% -m pip install --upgrade -r requirements.txt' - - '%PYTHON3% -m pip uninstall enum34 -y' + - '%PYTHON3-32% -v' + - '%PYTHON3-32% -m pip install --upgrade pip' + - '%PYTHON3-32% -m pip install --upgrade -r requirements.txt' + - '%PYTHON3-32% -m pip uninstall enum34 -y' script: - copy changelog.md doc\changelog.md - cd doc - '%PYTHON2% documentation_importer.py' - cd ..\src - '%PYTHON2% ..\doc\generator.py' - - '%PYTHON3% write_version_data.py' + - '%PYTHON3-32% write_version_data.py' - '%PYINSTALLER% main.spec' - cd .. - cd scripts - - '%PYTHON3% prepare_zipversion.py' + - '%PYTHON3-32% prepare_zipversion.py' - call genpot_interface.bat - call genpot_doc.bat - cd .. @@ -83,21 +83,21 @@ alpha: tags: - windows10 before_script: - - '%PYTHON3% -v' - - '%PYTHON3% -m pip install --upgrade pip cx_freeze' - - '%PYTHON3% -m pip install --upgrade -r requirements.txt' - - '%PYTHON3% -m pip uninstall enum34 -y' + - '%PYTHON3-32% -v' + - '%PYTHON3-32% -m pip install --upgrade pip cx_freeze' + - '%PYTHON3-32% -m pip install --upgrade -r requirements.txt' + - '%PYTHON3-32% -m pip uninstall enum34 -y' script: - copy changelog.md doc\changelog.md - cd doc - '%PYTHON2% documentation_importer.py' - cd ..\src - '%PYTHON2% ..\doc\generator.py' - - '%PYTHON3% write_version_data.py' - - '%PYTHON3% setup.py build' + - '%PYTHON3-32% write_version_data.py' + - '%PYTHON3-32% setup.py build' - cd .. - cd scripts - - '%PYTHON3% prepare_zipversion_cxfreeze.py' + - '%PYTHON3-32% prepare_zipversion_cxfreeze.py' - call genpot_interface.bat - call genpot_doc.bat - cd .. @@ -119,25 +119,25 @@ stable: tags: - windows before_script: - - '%PYTHON3% -v' - - '%PYTHON3% -m pip install --upgrade pip' - - '%PYTHON3% -m pip install --upgrade -r requirements.txt' - - '%PYTHON3% -m pip uninstall enum34 -y' + - '%PYTHON3-32% -v' + - '%PYTHON3-32% -m pip install --upgrade pip' + - '%PYTHON3-32% -m pip install --upgrade -r requirements.txt' + - '%PYTHON3-32% -m pip uninstall enum34 -y' script: - copy changelog.md doc\changelog.md - cd doc - '%PYTHON2% documentation_importer.py' - cd ..\src - '%PYTHON2% ..\doc\generator.py' - - '%PYTHON3% write_version_data.py' - - '%PYTHON3% setup.py build' + - '%PYTHON3-32% write_version_data.py' + - '%PYTHON3-32% setup.py build' - '%NSIS% installer.nsi' - cd .. - move src\socializer* . - cd scripts - - '%PYTHON3% prepare_zipversion_cxfreeze.py' + - '%PYTHON3-32% prepare_zipversion_cxfreeze.py' - cd .. - move src\socializer.zip socializer.zip - - '%PYTHON3% scripts/upload.py' + - '%PYTHON3-32% scripts/upload.py' only: - tags \ No newline at end of file