Skip to content

Commit

Permalink
update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
JarrettSJohnson committed Jan 5, 2025
1 parent 2a14d82 commit a362bfa
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,19 @@ jobs:
runs-on: windows-latest

env:
CONDA_ROOT: ${{github.workspace}}\..\tmp\mambaforge
MAMBAFORGE_EXEC: ${{github.workspace}}\..\tmp\mambaforge.exe
CONDA_ROOT: ${{github.workspace}}\..\tmp\miniforge
MINIFORGE_EXEC: ${{github.workspace}}\..\tmp\miniforge.exe

steps:
- uses: actions/[email protected]
- name: Download miniconda
- name: Download Miniforge
shell: cmd
run: |-
if not exist %CONDA_ROOT% mkdir %CONDA_ROOT%
curl -L -o %MAMBAFORGE_EXEC% https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-24.3.0-0-Windows-x86_64.exe
start /wait %MAMBAFORGE_EXEC% /S /D=%CONDA_ROOT%
curl -L -o %MINIFORGE_EXEC% https://github.com/conda-forge/miniforge/releases/download/24.11.0-0/Miniforge3-24.11.0-0-Windows-x86_64.exe
start /wait %MINIFORGE_EXEC% /S /D=%CONDA_ROOT%
- name: Set up Miniconda
- name: Set up Miniforge
shell: cmd
run: |-
CALL %CONDA_ROOT%\\Scripts\\activate.bat
Expand Down Expand Up @@ -107,13 +107,13 @@ jobs:
runs-on: macos-latest

env:
CONDA_ROOT: "/tmp/miniconda"
CONDA_ROOT: "/tmp/miniforge"

steps:
- uses: actions/[email protected]
- name: Set up Miniconda and Build
- name: Set up Miniforge and Build
run: |-
curl -L -o $CONDA_ROOT.sh https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-MacOSX-x86_64.sh
curl -L -o $CONDA_ROOT.sh https://github.com/conda-forge/miniforge/releases/download/24.11.0-0/Miniforge3-MacOSX-x86_64.sh
bash $CONDA_ROOT.sh -b -p $CONDA_ROOT
export PATH="$CONDA_ROOT/bin:$PATH"
conda config --set quiet yes
Expand Down
4 changes: 4 additions & 0 deletions testing/tests/api/importing.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ def testFetchLocal(self):
except ImportError:
import urlparse

if os.getenv('GITHUB_ACTIONS') and sys.platform == 'win32':
self.skipTest('Temporarily skip this test in GHA')
return

# PyMOL 1.8.6 adds full URLs, remove them
pdbpaths = pymol.importing.hostPaths['pdb']
if isinstance(pdbpaths, list):
Expand Down

0 comments on commit a362bfa

Please sign in to comment.