Skip to content

Commit

Permalink
Remove setuptools-conda local building work-around
Browse files Browse the repository at this point in the history
  • Loading branch information
dihm committed May 22, 2024
1 parent b783b99 commit 5dd987c
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/make_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,15 @@ jobs:
with:
xcode-version: latest-stable

# osx-arm64 build of setuptools-conda not available on channel yet, building locally
# osx-arm64 needs different compiler args (for CyRK at least)
- name: Conda package (macOS-arm64)
if: runner.os == 'macOS' && matrix.arch == 'arm64'
shell: bash -l {0}
run: |
export CC='gcc-13'
git clone https://github.com/chrisjbillington/setuptools-conda
cd setuptools-conda/
python -m setuptools_conda build .
python -m conda_index ./conda_packages
conda install conda_packages/osx-arm64/setuptools-conda-*.tar.bz2
cd ..
python make_packages.py ${{ runner.temp }}
- name: Conda package (Unix)
if: runner.os != 'Windows' && matrix.arch != 'arm64'
if: runner.os != 'Windows'
shell: bash -l {0}
run: |
conda install -c labscript-suite setuptools-conda
Expand Down

0 comments on commit 5dd987c

Please sign in to comment.