Skip to content

matrix workflow fix mac pdffit2 install #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbillinge merged 2 commits into from
Aug 28, 2024
Merged

matrix workflow fix mac pdffit2 install #201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddae510
matrix workflow fix mac pdffit2 install
Tieqiong Aug 26, 2024
7d1ad5e
fix pcmt
Tieqiong Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
python-version: ['3.10', '3.11', '3.12']
os: ["macos-latest", "ubuntu-latest", "windows-latest"]
steps:
- name: check out test_workflow
- name: check out diffpy.pdfgui
uses: actions/checkout@v4

- name: Initialize miniconda
Expand All @@ -36,13 +36,20 @@ jobs:
conda config --set always_yes yes
--set changeps1 no

- name: Install test_workflow and requirements
- name: Install diffpy.pdfgui and requirements
run: |
conda install --file requirements/run.txt
conda install --file requirements/test.txt
python -m pip install -r requirements/pip.txt
python -m pip install . --no-deps

- name: Install latest diffpy.pdffit2 for Mac
if: runner.os == 'macos-latest'
run: |
conda uninstall diffpy.pdffit2
brew install gsl
pip install diffpy.pdffit2==1.4.4rc1

- name: Install Xvfb
if: runner.os == 'Linux'
run: sudo apt-get install -y xvfb
Expand All @@ -53,7 +60,7 @@ jobs:
export DISPLAY=:99
Xvfb :99 -screen 0 1024x768x16 &

- name: Validate test_workflow
- name: Validate diffpy.pdfgui
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
export DISPLAY=:99
Expand Down