From e002bb2b2d6e14ed6b5a90797d6a1cd67bc6da4b Mon Sep 17 00:00:00 2001 From: Yiyao Wei Date: Mon, 31 May 2021 18:19:03 +0200 Subject: [PATCH] use Choco-Install --- .github/workflows/continous-integration.yml | 2 +- Makefile | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml index 6f6d998144fe..def620e13747 100644 --- a/.github/workflows/continous-integration.yml +++ b/.github/workflows/continous-integration.yml @@ -273,7 +273,7 @@ jobs: New-Item -Path $spacy_data_dir -Type Directory } make install-full - make prepare-tests-windows + make prepare-tests-windows-gha - name: Add github workflow problem matchers if: needs.changes.outputs.backend == 'true' && matrix.python-version == 3.6 && matrix.os == 'ubuntu-latest' diff --git a/Makefile b/Makefile index 272806199ba9..115393a2f704 100644 --- a/Makefile +++ b/Makefile @@ -135,18 +135,27 @@ prepare-tests-files: prepare-spacy prepare-mitie prepare-transformers prepare-wget-macos: brew install wget || true -prepare-wget-windows: - choco install wget - prepare-tests-macos: prepare-wget-macos prepare-tests-files brew install graphviz || true prepare-tests-ubuntu: prepare-tests-files sudo apt-get -y install graphviz graphviz-dev python-tk +prepare-wget-windows: + choco install wget + prepare-tests-windows: prepare-wget-windows prepare-tests-files choco install graphviz +# GitHub Action has pre-installed a helper function for installing Chocolatey packages +# It will retry the installation 5 times if it fails +# See: https://github.com/actions/virtual-environments/blob/main/images/win/scripts/ImageHelpers/ChocoHelpers.ps1 +prepare-wget-windows-gha: + Choco-Install wget + +prepare-tests-windows-gha: prepare-wget-windows-gha prepare-tests-files + Choco-Install graphviz + test: clean # OMP_NUM_THREADS can improve overall performance using one thread by process (on tensorflow), avoiding overload OMP_NUM_THREADS=1 poetry run pytest tests -n $(JOBS) --cov rasa --ignore $(INTEGRATION_TEST_FOLDER)