Skip to content

Commit

Permalink
remove workaround for M1 runners and no longer needed tokens in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
kafitzgerald authored Mar 22, 2024
1 parent 5b02d1b commit 53315d2
Showing 1 changed file with 12 additions and 22 deletions.
34 changes: 12 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,35 @@ on:
- cron: '0 0 * * *' # Daily “At 00:00”
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: Python (${{ matrix.python-version }}, ${{ matrix.os }})
runs-on: ${{ matrix.os }}
defaults:
run:
shell: bash -l {0}

strategy:
fail-fast: false
matrix:
os: [ "ubuntu-latest", "macos-latest", "macos-14", "windows-latest"]
python-version: [ "3.9", "3.11", "3.12" ]
steps:
- name: Cancel previous runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- name: checkout
uses: actions/checkout@v4
with:
token: ${{ github.token }}
- name: conda_setup
uses: conda-incubator/setup-miniconda@v3
if: matrix.os != 'macos-14'
with:
activate-environment: geocat_viz_build
channel-priority: strict
python-version: ${{ matrix.python-version }}
channels: conda-forge
environment-file: build_envs/environment.yml
- name: conda_setup_m1

- name: environment setup
uses: conda-incubator/setup-miniconda@v3
if: matrix.os == 'macos-14'
with:
installer-url: https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh
activate-environment: geocat_viz_build
channel-priority: strict
python-version: ${{ matrix.python-version }}
channels: conda-forge
environment-file: build_envs/environment.yml

- name: Install geocat-viz
run: |
python -m pip install . --no-deps
Expand All @@ -65,22 +53,24 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
with:
token: ${{ github.token }}
- name: conda_setup

- name: environment setup
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: gv-docs
channel-priority: strict
python-version: 3.9
channels: conda-forge
environment-file: build_envs/docs.yml

- name: Install geocat-viz
run: |
python -m pip install .
- name: check conda list
run: |
conda list
- name: Make docs with linkcheck
run: |
cd docs
Expand Down

0 comments on commit 53315d2

Please sign in to comment.