From 734e02541bc10eb6eee0866aa0f8cb6d9a0a2165 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:45:40 -0700 Subject: [PATCH 01/23] test --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af0a6a56..c6cc0ed3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - cron: '0 12 * * *' jobs: - check: + checklinux: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 @@ -18,4 +18,14 @@ jobs: tools/snippets install_pip_reqs - name: Run checks and tests run: make -j2 check test + checkwin: + runs-on: windows-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python + uses: action/setup-python@1 + with: + python-version: 3.7 + - name: Display Python version + run: python3 -c "import sys; print(sys.version)" From 28f74a175e93956a7a87a7d00a527813cb1cc276 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:47:00 -0700 Subject: [PATCH 02/23] action test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6cc0ed3..41e241c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Set up Python - uses: action/setup-python@1 + uses: actions/setup-python@1 with: python-version: 3.7 - name: Display Python version From 6e13f67355f611d4a0145dd27b2edd4e1e9352f5 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:48:20 -0700 Subject: [PATCH 03/23] action test --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41e241c6..97aefba5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - cron: '0 12 * * *' jobs: - checklinux: + CI Linux: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 @@ -18,12 +18,12 @@ jobs: tools/snippets install_pip_reqs - name: Run checks and tests run: make -j2 check test - checkwin: + CI Windows: runs-on: windows-latest steps: - uses: actions/checkout@v1 - name: Set up Python - uses: actions/setup-python@1 + uses: actions/setup-python@v1 with: python-version: 3.7 - name: Display Python version From c6a869acba3e4a72f7942f62aa1205f755d527e1 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:48:50 -0700 Subject: [PATCH 04/23] action test --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97aefba5..e4369854 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - cron: '0 12 * * *' jobs: - CI Linux: + ci_unix: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 @@ -18,7 +18,7 @@ jobs: tools/snippets install_pip_reqs - name: Run checks and tests run: make -j2 check test - CI Windows: + ci_windows: runs-on: windows-latest steps: - uses: actions/checkout@v1 From f6ab8cc2de3c03d575dff848ef6c5124e86de15e Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:50:12 -0700 Subject: [PATCH 05/23] action test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4369854..54c7dcfc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,5 +27,5 @@ jobs: with: python-version: 3.7 - name: Display Python version - run: python3 -c "import sys; print(sys.version)" + run: python -c "import sys; print(sys.version)" From b0fc27f5236f403942258b2579de71efc56d111a Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:51:33 -0700 Subject: [PATCH 06/23] action test --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54c7dcfc..382966a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: sudo apt-get -y install python3.7 python3.7-dev python3-pip python3-setuptools tools/snippets install_pip_reqs - name: Run checks and tests - run: make -j2 check test + run: echo make -j2 check test ci_windows: runs-on: windows-latest steps: @@ -27,5 +27,5 @@ jobs: with: python-version: 3.7 - name: Display Python version - run: python -c "import sys; print(sys.version)" + run: python tools/snippets From 1ecb5721391f7bf577b02548b46b8b66df8cd895 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:52:46 -0700 Subject: [PATCH 07/23] action test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 382966a9..88d16eff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,5 +27,5 @@ jobs: with: python-version: 3.7 - name: Display Python version - run: python tools/snippets + run: python tools/snippets install_pip_reqs From 612b0b688514ac6920c2d42ee18628c46ff04791 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:53:39 -0700 Subject: [PATCH 08/23] action test --- .github/workflows/ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88d16eff..303bf681 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,19 @@ jobs: tools/snippets install_pip_reqs - name: Run checks and tests run: echo make -j2 check test + ci_unix2: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v1 + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: 3.7 + - name: Install dependencies + run: | + tools/snippets install_pip_reqs + - name: Run checks and tests + run: echo make -j2 check test ci_windows: runs-on: windows-latest steps: From 4397f21c5d9d036c762e4244642fa6917662157d Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 18:55:26 -0700 Subject: [PATCH 09/23] action test --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 303bf681..189c0ba6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,10 +27,9 @@ jobs: with: python-version: 3.7 - name: Install dependencies - run: | - tools/snippets install_pip_reqs + run: tools/snippets install_pip_reqs - name: Run checks and tests - run: echo make -j2 check test + run: make -j2 check test ci_windows: runs-on: windows-latest steps: @@ -40,5 +39,5 @@ jobs: with: python-version: 3.7 - name: Display Python version - run: python tools/snippets install_pip_reqs + run: python tools/snippets list_pip_reqs From ad991c6560d26311a5d0a01148b8edf5999793fb Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:02:09 -0700 Subject: [PATCH 10/23] action test --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 189c0ba6..bebf586f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,10 @@ jobs: uses: actions/setup-python@v1 with: python-version: 3.7 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pytest - name: Display Python version - run: python tools/snippets list_pip_reqs + run: make From 0e90d78efc84b5062ee9cceea6ac334e7b8a7e4e Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:05:26 -0700 Subject: [PATCH 11/23] action test --- .github/workflows/ci.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bebf586f..99529eed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,17 +8,8 @@ on: - cron: '0 12 * * *' jobs: + ci_unix: - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v1 - - name: Install dependencies - run: | - sudo apt-get -y install python3.7 python3.7-dev python3-pip python3-setuptools - tools/snippets install_pip_reqs - - name: Run checks and tests - run: echo make -j2 check test - ci_unix2: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 @@ -30,6 +21,7 @@ jobs: run: tools/snippets install_pip_reqs - name: Run checks and tests run: make -j2 check test + ci_windows: runs-on: windows-latest steps: @@ -42,6 +34,6 @@ jobs: run: | python -m pip install --upgrade pip pip install pytest - - name: Display Python version - run: make + - name: Run tests + run: python tools/snippets pytest -v tests From 545e53d1f7906962395a37dba6a112f5298a6208 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:08:58 -0700 Subject: [PATCH 12/23] action test --- tools/efrotools/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/efrotools/__init__.py b/tools/efrotools/__init__.py index aaf0730a..7262e580 100644 --- a/tools/efrotools/__init__.py +++ b/tools/efrotools/__init__.py @@ -29,6 +29,7 @@ from __future__ import annotations import os import json import subprocess +import platform from pathlib import Path from typing import TYPE_CHECKING @@ -37,7 +38,7 @@ if TYPE_CHECKING: from typing_extensions import Literal # Python binary assumed by these tools. -PYTHON_BIN = 'python3.7' +PYTHON_BIN = 'python3.7' if platform.system() != 'Windows' else 'python' MIT_LICENSE = """Copyright (c) 2011-2020 Eric Froemling From 621bfea07bda9c9c3724b9ef4008bb2fe3c762ed Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:12:04 -0700 Subject: [PATCH 13/23] action test --- tools/efrotools/snippets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index da236c00..b4bbb20f 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -451,6 +451,7 @@ def pytest() -> None: raise CleanError('python_paths not found in project config.') os.environ['PYTHONPATH'] = ':'.join(pypaths) + print('SET VAL TO', ':'.join(pypaths), flush=True) # Also tell Python interpreters not to write __pycache__ dirs everywhere # which can screw up our builds. From 434c1c625814d386aca6d0e22e701903f74ebedc Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:15:14 -0700 Subject: [PATCH 14/23] action test --- tools/efrotools/snippets.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index b4bbb20f..313f1788 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -443,6 +443,7 @@ def compile_python_files() -> None: def pytest() -> None: """Run pytest with project environment set up properly.""" + import platform from efrotools import get_config, PYTHON_BIN # Grab our python paths for the project and stuff them in PYTHONPATH. @@ -450,6 +451,9 @@ def pytest() -> None: if pypaths is None: raise CleanError('python_paths not found in project config.') + if platform.system() == 'Windows': + pypaths = [s.replace('/', '\\') for s in pypaths] + os.environ['PYTHONPATH'] = ':'.join(pypaths) print('SET VAL TO', ':'.join(pypaths), flush=True) From 15fc842ee55dee446a7a7dc67582920b39953f2c Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:18:19 -0700 Subject: [PATCH 15/23] action test --- tests/test_ba/test_assetmanager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_ba/test_assetmanager.py b/tests/test_ba/test_assetmanager.py index d324d075..d2135577 100644 --- a/tests/test_ba/test_assetmanager.py +++ b/tests/test_ba/test_assetmanager.py @@ -39,13 +39,16 @@ if TYPE_CHECKING: def test_assetmanager() -> None: """Testing.""" + import sys + import os + print('PATH IS', sys.path) + print('CWD IS', os.getcwd()) with tempfile.TemporaryDirectory() as tmpdir: manager = AssetManager(rootdir=Path(tmpdir)) wref = weakref.ref(manager) manager.start() - gather = manager.launch_gather(packages=['a@2'], flavor=AssetPackageFlavor.DESKTOP, account_token='dummytoken') From 99e60a8da28ec3140d7c5d39e6acf3d73ab822f2 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:20:33 -0700 Subject: [PATCH 16/23] action test --- tests/test_ba/test_assetmanager.py | 4 ---- tools/efrotools/snippets.py | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/test_ba/test_assetmanager.py b/tests/test_ba/test_assetmanager.py index d2135577..133dcc9b 100644 --- a/tests/test_ba/test_assetmanager.py +++ b/tests/test_ba/test_assetmanager.py @@ -39,10 +39,6 @@ if TYPE_CHECKING: def test_assetmanager() -> None: """Testing.""" - import sys - import os - print('PATH IS', sys.path) - print('CWD IS', os.getcwd()) with tempfile.TemporaryDirectory() as tmpdir: diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index 313f1788..8ac3d9f6 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -446,6 +446,9 @@ def pytest() -> None: import platform from efrotools import get_config, PYTHON_BIN + print('PATH IS', sys.path) + print('CWD IS', os.getcwd()) + # Grab our python paths for the project and stuff them in PYTHONPATH. pypaths = get_config(PROJROOT).get('python_paths') if pypaths is None: From 5b8a70fb3327d78485c1ebfc0e84afd48db1f2f1 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:22:20 -0700 Subject: [PATCH 17/23] action test --- tools/efrotools/snippets.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index 8ac3d9f6..e2a6c013 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -455,7 +455,9 @@ def pytest() -> None: raise CleanError('python_paths not found in project config.') if platform.system() == 'Windows': - pypaths = [s.replace('/', '\\') for s in pypaths] + pypaths = [ + os.path.join(os.getcwd(), s.replace('/', '\\')) for s in pypaths + ] os.environ['PYTHONPATH'] = ':'.join(pypaths) print('SET VAL TO', ':'.join(pypaths), flush=True) From 410f1317ab08b582e75c9eca4148c9ac4eff8af5 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:25:27 -0700 Subject: [PATCH 18/23] action test --- tools/efrotools/snippets.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index e2a6c013..67a37a63 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -449,6 +449,9 @@ def pytest() -> None: print('PATH IS', sys.path) print('CWD IS', os.getcwd()) + subprocess.run([PYTHON_BIN, '-c', 'import sys; print("FOOO", sys.path)'], + check=True) + # Grab our python paths for the project and stuff them in PYTHONPATH. pypaths = get_config(PROJROOT).get('python_paths') if pypaths is None: From 311c17a4b178984433ee528046435d192d07c405 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:26:45 -0700 Subject: [PATCH 19/23] action test --- tools/efrotools/snippets.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index 67a37a63..9d0a6b03 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -449,9 +449,6 @@ def pytest() -> None: print('PATH IS', sys.path) print('CWD IS', os.getcwd()) - subprocess.run([PYTHON_BIN, '-c', 'import sys; print("FOOO", sys.path)'], - check=True) - # Grab our python paths for the project and stuff them in PYTHONPATH. pypaths = get_config(PROJROOT).get('python_paths') if pypaths is None: @@ -463,6 +460,9 @@ def pytest() -> None: ] os.environ['PYTHONPATH'] = ':'.join(pypaths) + subprocess.run([PYTHON_BIN, '-c', 'import sys; print("FOOO", sys.path)'], + check=True) + print('SET VAL TO', ':'.join(pypaths), flush=True) # Also tell Python interpreters not to write __pycache__ dirs everywhere From 7951a6093b80cbffdb496240e240c83d42cbacb6 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:29:35 -0700 Subject: [PATCH 20/23] action test --- tools/efrotools/snippets.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index 9d0a6b03..d9cbb964 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -455,11 +455,14 @@ def pytest() -> None: raise CleanError('python_paths not found in project config.') if platform.system() == 'Windows': + sep = ';' pypaths = [ os.path.join(os.getcwd(), s.replace('/', '\\')) for s in pypaths ] + else: + sep = ':' - os.environ['PYTHONPATH'] = ':'.join(pypaths) + os.environ['PYTHONPATH'] = sep.join(pypaths) subprocess.run([PYTHON_BIN, '-c', 'import sys; print("FOOO", sys.path)'], check=True) From 90dfac00c65f38d40993a8ae1b4206042b739542 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:31:46 -0700 Subject: [PATCH 21/23] action test --- tools/efrotools/snippets.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index d9cbb964..d342ce6d 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -446,9 +446,6 @@ def pytest() -> None: import platform from efrotools import get_config, PYTHON_BIN - print('PATH IS', sys.path) - print('CWD IS', os.getcwd()) - # Grab our python paths for the project and stuff them in PYTHONPATH. pypaths = get_config(PROJROOT).get('python_paths') if pypaths is None: @@ -456,9 +453,9 @@ def pytest() -> None: if platform.system() == 'Windows': sep = ';' - pypaths = [ - os.path.join(os.getcwd(), s.replace('/', '\\')) for s in pypaths - ] + # pypaths = [ + # os.path.join(os.getcwd(), s.replace('/', '\\')) for s in pypaths + # ] else: sep = ':' From 3dcea9da30098ba672f395b7ce30cf138915d59b Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:35:56 -0700 Subject: [PATCH 22/23] action test --- tools/efrotools/snippets.py | 15 ++------------- tools/efrotools/statictest.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index d342ce6d..fe5fb075 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -451,19 +451,8 @@ def pytest() -> None: if pypaths is None: raise CleanError('python_paths not found in project config.') - if platform.system() == 'Windows': - sep = ';' - # pypaths = [ - # os.path.join(os.getcwd(), s.replace('/', '\\')) for s in pypaths - # ] - else: - sep = ':' - - os.environ['PYTHONPATH'] = sep.join(pypaths) - subprocess.run([PYTHON_BIN, '-c', 'import sys; print("FOOO", sys.path)'], - check=True) - - print('SET VAL TO', ':'.join(pypaths), flush=True) + separator = ';' if platform.system() == 'Windows' else ':' + os.environ['PYTHONPATH'] = separator.join(pypaths) # Also tell Python interpreters not to write __pycache__ dirs everywhere # which can screw up our builds. diff --git a/tools/efrotools/statictest.py b/tools/efrotools/statictest.py index 04092d6f..48db7cfd 100644 --- a/tools/efrotools/statictest.py +++ b/tools/efrotools/statictest.py @@ -26,6 +26,7 @@ from typing import TYPE_CHECKING import tempfile import os import subprocess +import logging if TYPE_CHECKING: from typing import Any, Type, Dict, Optional, List, Union @@ -180,8 +181,17 @@ def static_type_equals(value: Any, statictype: Union[Type, str]) -> bool: a match (for instance, if mypy outputs 'builtins.int*' it will match the 'int' type passed in as statictype). """ + import platform from inspect import getframeinfo, stack + # NOTE: don't currently support windows here; just going to always + # pass so we don't have to conditionalize all our individual test + # locations. + if platform.system() == 'Windows': + logging.debug('static_type_equals not supported on windows;' + ' will always pass...') + return True + # We don't actually use there here; we pull them as strings from the src. del value From 2510f2946e8e461734ed9ea0097b3f94f1b01d73 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Thu, 26 Mar 2020 19:53:16 -0700 Subject: [PATCH 23/23] added windows unit testing --- .github/workflows/ci.yml | 9 +++++++-- .idea/dictionaries/ericf.xml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99529eed..4b33ee25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,9 @@ on: - cron: '0 12 * * *' jobs: - + + # We run most of our testing on linux but it should apply to mac too; + # we can always add an explicit mac job if it seems worthwhile. ci_unix: runs-on: ubuntu-18.04 steps: @@ -21,7 +23,10 @@ jobs: run: tools/snippets install_pip_reqs - name: Run checks and tests run: make -j2 check test - + + # Most of our toolset doesn't work on raw windows (outside of WSL). + # However, it's nice to at least run unit tests there since some behavior + # (filesystem, etc) can vary significantly. ci_windows: runs-on: windows-latest steps: diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index 08a0a985..1e9fa01d 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -308,6 +308,7 @@ completecmd compounddict compoundlist + conditionalize configerror confighash configkey