Skip to content

Commit 9022370

Browse files
authored
Modify conda installation and build steps in workflow
Try to address build bug where conda build is not found, using CoPilot suggestion. While at it, switch to latest version of constructor.
1 parent 752844a commit 9022370

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

.github/workflows/g2main-test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,21 @@ jobs:
4040
# do this here so it is not buried in the .yml
4141
#conda install constructor=3.11.2
4242
#conda install constructor=3.9
43-
conda install conda-standalone=24.9.2 # works with constructor 3.11.1
43+
# 5/6/26 removing next line to use the lastest constructor now that 3.15 is out
44+
#conda install conda-standalone=24.9.2 # works with constructor 3.11.1
4445
4546
- name: create gsas2main conda package
4647
shell: bash -l {0}
4748
run: |
49+
conda activate conda
4850
cd install
51+
python GSAS2main/makeBldFiles.py
4952
if [ "$RUNNER_OS" == "Windows" ]; then
5053
echo "Windows build"
51-
python GSAS2main/makeBldFiles.py
5254
conda config --set anaconda_upload yes
5355
conda build GSAS2main --output-folder C:/tmp/builds --user briantoby --token ${{ secrets.ANACONDA_TOKEN }}
5456
else
5557
echo "Unix build"
56-
python GSAS2main/makeBldFiles.py
5758
conda build GSAS2main --output-folder ~/build # use below due to patch above
5859
#conda build GSAS2main --output-folder ~/build --package-format .conda
5960
anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload ~/build/*/*.conda --user briantoby --force

0 commit comments

Comments
 (0)