diff --git a/.github/workflows/conda.yml b/.github/workflows/conda-dev.yml similarity index 89% rename from .github/workflows/conda.yml rename to .github/workflows/conda-dev.yml index 6312fc2..3c1769b 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda-dev.yml @@ -2,10 +2,10 @@ name: CondaDev on: workflow_dispatch: - #push: - #branches: - #- master - #pull_request: + push: + branches: + - master + pull_request: jobs: build: @@ -14,8 +14,8 @@ jobs: strategy: fail-fast: false matrix: - os: ['macos-11', 'ubuntu-22.04'] - python-version: ['3.8', '3.11'] + os: ['ubuntu-22.04', 'macos-13', 'windows-latest'] + python-version: [3.8', '3.9', '3.10', '3.11', '3.12'] env: OS: ${{ matrix.os }} PYTHON: ${{ matrix.python-version }} @@ -23,8 +23,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 with: @@ -39,7 +37,7 @@ jobs: uses: actions/cache@v4 env: # Increase this value to reset cache and rebuild the env during the PR - CACHE_NUMBER: 3 + CACHE_NUMBER: 0 with: path: /home/runner/conda_pkgs_dir key: diff --git a/environment.devenv.yml b/environment.devenv.yml index dcdee67..38b3b30 100644 --- a/environment.devenv.yml +++ b/environment.devenv.yml @@ -1,8 +1,8 @@ name: pyre2 dependencies: - - python ==3.11 - - cmake >=3.18 + - python + - cmake>=3.18 - ninja - cython - cxx-compiler @@ -11,4 +11,3 @@ dependencies: - re2 - pytest - regex - - six