Skip to content

Commit

Permalink
Merge pull request #1158 from jbellister-slac/update-action
Browse files Browse the repository at this point in the history
MNT: Update versions of checkout and setup-miniconda actions
  • Loading branch information
YektaY authored Jan 16, 2025
2 parents 96e8cfd + 7434261 commit 50029f6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,25 @@ jobs:
QT_MAC_WANTS_LAYER: 1 # PyQT gui tests involving qtbot interaction on macOS will fail without this

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
python-version: ${{ matrix.python-version }}
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: pydm-env
conda-remove-defaults: true
architecture: x64 # Ensure macOS finds PyQt 5.12.3 which isn't available with osx-arm64

- name: Install PyDM with Mamba
shell: bash -el {0}
run: |
mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }}
if [ "$RUNNER_OS" == "Windows" ]; then
conda install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }}
else
mamba install -c conda-forge pydm pyqt=${{ matrix.pyqt-version }}
fi
- name: Install additional Python dependencies with pip
shell: bash -el {0}
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2017-2020, The Board of Trustees of the Leland Stanford
Copyright (c) 2017-2025, The Board of Trustees of the Leland Stanford
Junior University, through SLAC National Accelerator Laboratory
(subject to receipt of any required approvals from the U.S. Dept. of
Energy). All rights reserved. Redistribution and use in source and
Expand Down

0 comments on commit 50029f6

Please sign in to comment.