Skip to content

Commit 46096ea

Browse files
committed
Split setuptools-conda installation step from package building step.
Try using bash on Windows to combine steps too. Add debug print to make_packages.py
1 parent 8a30cc9 commit 46096ea

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

.github/workflows/make_packages.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,14 @@ jobs:
5858
architecture: ${{ matrix.arch }}
5959
auto-activate: true
6060

61-
- name: Build (Unix)
62-
if: runner.os != 'Windows'
61+
- name: Install setuptools-conda
6362
shell: bash -l {0}
6463
run: |
6564
conda install -c labscript-suite setuptools-conda
66-
python make_packages.py ${{ runner.temp }} --package "${{ matrix.name }}"
6765
68-
- name: Build (Windows)
69-
if: runner.os == 'Windows'
70-
shell: cmd /C CALL {0}
66+
- name: Build
67+
shell: bash -l {0}
7168
run: |
72-
conda install -c labscript-suite setuptools-conda && ^
7369
python make_packages.py ${{ runner.temp }} --package "${{ matrix.name }}"
7470
7571
- uses: actions/upload-artifact@v7
@@ -105,10 +101,14 @@ jobs:
105101
conda-remove-defaults: true
106102
auto-activate: true
107103

108-
- name: Build noarch package
104+
- name: Install setuptools-conda
109105
shell: bash -l {0}
110106
run: |
111107
conda install -c labscript-suite setuptools-conda
108+
109+
- name: Build noarch package
110+
shell: bash -l {0}
111+
run: |
112112
python make_packages.py ${{ runner.temp }} --package "${{ matrix.name }}"
113113
114114
- uses: actions/upload-artifact@v7

make_packages.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ def build_conda_package(name, spec):
111111
if PY not in pythons:
112112
print(f"Skipping {name} as {PY} is not in its list of Python versions")
113113
return
114+
115+
print(f'=====> Building {name:s} with options:')
116+
print(f'\t\t{version=}\n\t\t{source=}\n\t\t{build_args=}\n\t\t{noarch=}\n\t\t{pythons=}\n\t\t{platforms=}')
114117

115118
# Download it:
116119
project_dir = download(name, source, version)

0 commit comments

Comments
 (0)