diff --git a/.github/workflows/testmatrix.yml b/.github/workflows/testmatrix.yml index f3d5751b67..5adb74dc0c 100644 --- a/.github/workflows/testmatrix.yml +++ b/.github/workflows/testmatrix.yml @@ -10,6 +10,7 @@ on: - '*.md' - '*.svg' - '*.png' + - .github/workflows/testwindows.yml branches: [ "master" ] pull_request: paths-ignore: @@ -20,6 +21,7 @@ on: - '*.md' - '*.svg' - '*.png' + - .github/workflows/testwindows.yml branches: [ "master", "v2" ] env: diff --git a/.github/workflows/testreporting.yml b/.github/workflows/testreporting.yml index a538133516..c17c577c9d 100644 --- a/.github/workflows/testreporting.yml +++ b/.github/workflows/testreporting.yml @@ -9,6 +9,7 @@ on: - README.* - '*.md' - '*.svg' + - .github/workflows/testwindows.yml branches: [ "master", "v2" ] pull_request: paths-ignore: @@ -18,6 +19,7 @@ on: - README.* - '*.md' - '*.svg' + - .github/workflows/testwindows.yml branches: [ "master", "v2" ] env: diff --git a/.github/workflows/testwindows.yml b/.github/workflows/testwindows.yml index 90c6e36512..e8b730facd 100644 --- a/.github/workflows/testwindows.yml +++ b/.github/workflows/testwindows.yml @@ -10,6 +10,8 @@ on: - '*.md' - '*.svg' - '*.png' + - .github/workflows/testmatrix.yml + - .github/workflows/testreporting.yml branches: [ "master" ] pull_request: paths-ignore: @@ -20,6 +22,8 @@ on: - '*.md' - '*.svg' - '*.png' + - .github/workflows/testmatrix.yml + - .github/workflows/testreporting.yml branches: [ "master", "v2" ] env: @@ -60,6 +64,8 @@ jobs: run: > set PATH=C:\Miniconda;C:\Miniconda\Library\bin;C:\Miniconda\Scripts;%PATH% + conda init + conda activate test-environment cmake -Bbuild -S. -GNinja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} @@ -75,6 +81,8 @@ jobs: - name: Build shell: cmd run: | + set PATH=C:\Miniconda;C:\Miniconda\Library\bin;C:\Miniconda\Scripts;%PATH% + conda init conda activate test-environment cmake --build build python -m pip wheel -w .\wheel build\api\swig\python @@ -82,6 +90,8 @@ jobs: - name: Install shell: cmd run: | + set PATH=C:\Miniconda;C:\Miniconda\Library\bin;C:\Miniconda\Scripts;%PATH% + conda init conda activate test-environment cmake --install build python -m pip install .\wheel\bagPy-*.whl @@ -90,6 +100,8 @@ jobs: shell: cmd # Execute C++ and Python tests run: | + set PATH=C:\Miniconda;C:\Miniconda\Library\bin;C:\Miniconda\Scripts;%PATH% + conda init conda activate test-environment set BAG_SAMPLES_PATH=%github.workspace%\examples\sample-data .\build\tests\bag_tests