Skip to content

Commit 312b2f2

Browse files
authored
matrix workflow fix mac pdffit2 install (#201)
* matrix workflow fix mac pdffit2 install * fix pcmt
1 parent 15a4ee8 commit 312b2f2

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

.github/workflows/matrix.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
python-version: ['3.10', '3.11', '3.12']
2020
os: ["macos-latest", "ubuntu-latest", "windows-latest"]
2121
steps:
22-
- name: check out test_workflow
22+
- name: check out diffpy.pdfgui
2323
uses: actions/checkout@v4
2424

2525
- name: Initialize miniconda
@@ -36,13 +36,20 @@ jobs:
3636
conda config --set always_yes yes
3737
--set changeps1 no
3838
39-
- name: Install test_workflow and requirements
39+
- name: Install diffpy.pdfgui and requirements
4040
run: |
4141
conda install --file requirements/run.txt
4242
conda install --file requirements/test.txt
4343
python -m pip install -r requirements/pip.txt
4444
python -m pip install . --no-deps
4545
46+
- name: Install latest diffpy.pdffit2 for Mac
47+
if: runner.os == 'macos-latest'
48+
run: |
49+
conda uninstall diffpy.pdffit2
50+
brew install gsl
51+
pip install diffpy.pdffit2==1.4.4rc1
52+
4653
- name: Install Xvfb
4754
if: runner.os == 'Linux'
4855
run: sudo apt-get install -y xvfb
@@ -53,7 +60,7 @@ jobs:
5360
export DISPLAY=:99
5461
Xvfb :99 -screen 0 1024x768x16 &
5562
56-
- name: Validate test_workflow
63+
- name: Validate diffpy.pdfgui
5764
run: |
5865
if [ "$RUNNER_OS" == "Linux" ]; then
5966
export DISPLAY=:99

0 commit comments

Comments
 (0)