Skip to content

Commit

Permalink
Use macos-latest in all actions (#1987)
Browse files Browse the repository at this point in the history
* Use `macos-latest` in all actions

* Drop mypy

* Do not trust `conda` alias

* Remove dev code, bump `setup-micromamba`
  • Loading branch information
mattwthompson authored Dec 19, 2024
1 parent c9fa8c2 commit 4094fc5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 29 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
# Nightly tests run on main by default:
# Scheduled workflows run on the latest commit on the default or base branch.
# (from https://help.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
- cron: "0 0 * * *"
- cron: "21 0 * * *"

defaults:
run:
Expand Down Expand Up @@ -74,15 +74,11 @@ jobs:
fi
- name: Install environment with ${{ env.JOBNAME }}
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v2
with:
environment-file: devtools/conda-envs/${{ env.ENVFILE }}.yaml
create-args: >-
python=${{ matrix.python-version }}
# default - will pull down 2.0 which we don't want!
# micromamba-version: latest
# pin to latest 1.x release
micromamba-version: "1.5.10-0"
- name: Make oe_license.txt file from GH org secret "OE_LICENSE"
env:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/beta_rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Tests against beta/RC builds

on:
schedule:
- cron: "0 3 * * 0"
- cron: "0 22 * * *"
workflow_dispatch:

defaults:
Expand All @@ -18,7 +18,7 @@ jobs:
matrix:
os:
- ubuntu-latest
- macos-12
- macos-latest
python-version:
- "3.11"

Expand All @@ -31,8 +31,8 @@ jobs:
with:
fetch-depth: 0

- name: Install environment with ${{ env.JOBNAME }}
uses: mamba-org/setup-micromamba@v1
- name: Install environment
uses: mamba-org/setup-micromamba@v2
with:
environment-file: devtools/conda-envs/test_env.yaml
condarc: |
Expand Down Expand Up @@ -66,14 +66,14 @@ jobs:
run: python -m pip install utilities/test_plugins

- name: Environment Information
run: micromamba info && micromamba list
run: |
micromamba info
micromamba list
pip list
- name: Check links
run: pytest -r fE --tb=short openff/toolkit/_tests/test_links.py

- name: Run mypy
run: mypy -p "openff.toolkit"

- name: Run unit tests
run: |
PYTEST_ARGS+=" --ignore=openff/toolkit/_tests/test_examples.py"
Expand Down
22 changes: 8 additions & 14 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- released
- prereleased
schedule:
- cron: "0 0 * * *"
- cron: "0 20 * * *"
workflow_dispatch:

defaults:
Expand All @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-12]
os: [ubuntu-latest, macos-latest]
python-version: ["3.10"]
openeye: ["true", "false"]

Expand All @@ -35,27 +35,20 @@ jobs:
- uses: actions/checkout@v4

- name: Vanilla install from conda
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v2
if: ${{ matrix.openeye == 'false' }}
with:
environment-file: devtools/conda-envs/conda.yaml
create-args: >-
python=${{ matrix.python-version }}
# default - will pull down 2.0 which we don't want!
# micromamba-version: latest
# pin to latest 1.x release
micromamba-version: "1.5.10-0"
- name: Install from conda with OpenEye
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v2
if: ${{ matrix.openeye == 'true' }}
with:
environment-file: devtools/conda-envs/conda_oe.yaml
create-args: >-
python=${{ matrix.python-version }}
# default - will pull down 2.0 which we don't want!
# micromamba-version: latest
# pin to latest 1.x release
micromamba-version: "1.5.10-0"
- name: Additional info about the build
run: |
Expand All @@ -71,8 +64,9 @@ jobs:
- name: Environment Information
run: |
conda info
conda list
micromamba info
micromamba list
pip list
- name: Check installed toolkits
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
fi
- name: Install conda environment with ${{ env.ENVFILE }}
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v2
with:
environment-file: devtools/conda-envs/${{env.ENVFILE}}-examples.yaml
create-args: >-
Expand Down

0 comments on commit 4094fc5

Please sign in to comment.