diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa17b29fe..d6f0f0913 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,51 +33,51 @@ defaults: jobs: tests: name: ${{ matrix.os }}, Python ${{ matrix.python-version }}, ${{ matrix.conda-standalone }} - runs-on: ${{ matrix.os }}-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: include: # UBUNTU - - os: ubuntu + - os: ubuntu-latest python-version: "3.8" conda-standalone: conda-standalone check-docs: true - - os: ubuntu + - os: ubuntu-latest python-version: "3.9" conda-standalone: conda-standalone check-docs: true - - os: ubuntu + - os: ubuntu-latest python-version: "3.10" conda-standalone: conda-standalone-nightly - - os: ubuntu + - os: ubuntu-latest python-version: "3.11" conda-standalone: micromamba # MACOS - - os: macos + - os: macos-13 python-version: "3.8" conda-standalone: conda-standalone-nightly # Not running for 3.9 to save some CI resources # - os: macos # python-version: "3.9" # conda-standalone: conda-standalone - - os: macos + - os: macos-13 python-version: "3.10" conda-standalone: micromamba - - os: macos + - os: macos-13 python-version: "3.11" conda-standalone: conda-standalone # WINDOWS - - os: windows + - os: windows-latest python-version: "3.8" conda-standalone: conda-standalone - - os: windows + - os: windows-latest python-version: "3.9" conda-standalone: conda-standalone-nightly - - os: windows + - os: windows-latest python-version: "3.10" conda-standalone: conda-standalone - - os: windows + - os: windows-latest python-version: "3.11" # conda-standalone: micromamba conda-standalone: conda-standalone-nightly @@ -89,7 +89,7 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: activate-environment: constructor-dev environment-file: dev/environment.yml @@ -97,8 +97,8 @@ jobs: - name: Supply extra dependencies and install constructor run: | files=(--file "tests/requirements.txt") - test -f dev/extra-requirements-${{ matrix.os }}.txt \ - && files+=(--file "dev/extra-requirements-${{ matrix.os }}.txt") + test -f dev/extra-requirements-${{ runner.os }}.txt \ + && files+=(--file "dev/extra-requirements-${{ runner.os }}.txt") conda install ${files[@]} -y echo "NSIS_USING_LOG_BUILD=1" >> $GITHUB_ENV pip install -e . --no-deps --no-build-isolation @@ -106,7 +106,7 @@ jobs: run: | if [[ "${{ matrix.conda-standalone }}" == "micromamba" ]]; then conda create -yqp "${{ runner.temp }}/micromamba" -c conda-forge micromamba - if [[ ${{ matrix.os }} == "windows" ]]; then + if [[ "${{ runner.os }}" == "Windows" ]]; then echo "CONSTRUCTOR_CONDA_EXE=${{ runner.temp }}/micromamba/Library/bin/micromamba.exe" >> $GITHUB_ENV else echo "CONSTRUCTOR_CONDA_EXE=${{ runner.temp }}/micromamba/bin/micromamba" >> $GITHUB_ENV @@ -183,8 +183,10 @@ jobs: include: - runner: ubuntu-latest subdir: linux-64 - - runner: macos-latest + - runner: macos-13 subdir: osx-64 + - runner: macos-14 # FUTURE: Use latest + subdir: osx-arm64 - runner: windows-latest subdir: win-64 runs-on: ${{ matrix.runner }}