Skip to content

Commit 4cc3fc9

Browse files
committed
debug binary install
1 parent 660f03f commit 4cc3fc9

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/g2new-redhat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
shell: bash -l {0}
5858
run: |
5959
source /local/bht/py313-build/bin/activate
60-
#rm -rf ~/.conda/constructor # strange, why needed?
60+
rm -rf ~/.conda/constructor # strange, why needed?
6161
cd /local/bht/buildtools/install
6262
constructor RHEL
6363
# Now have a gsas2new-rhel-####-<platform>.sh/.exe

.github/workflows/matrix-testbin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
fail-fast: false
1616

1717
matrix:
18-
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
19-
# os: [windows-latest, macos-13, macos-14]
18+
# os: [ubuntu-latest, windows-latest, macos-13, macos-14]
19+
os: [windows-latest, macos-14]
2020
# os: [ubuntu-latest, macos-13, macos-14]
2121
# os: [ubuntu-latest]
2222
# os: [macos-14]

.github/workflows/testbin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
shell: bash -el {0}
5656
run: |
5757
curl -L -O https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/raw/main/install/gitstrap.py
58-
python gitstrap.py --nocheck --noshortcut --branch=main
58+
python gitstrap.py --nocheck --noshortcut --branch=main --noprogress
5959
6060
- name: GSAS-II all tests
6161
shell: bash -el {0}

install/gitstrap.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,10 +462,11 @@ def gitResetGSASII(repo_path,verbose=True):
462462
else:
463463
tarURLs = [GSASIIpath.getGitBinaryLoc(verbose=True,
464464
npver=npVersion,pyver=pyVersion)]
465+
print('tarURLs=',tarURLs,npVersion,pyVersion)
465466
for tarURL in tarURLs:
466467
if not tarURL:
467468
print('no Binary URL found. Aborting installation')
468-
if not allBinaries: sys.exit()
469+
if not allBinaries: sys.exit(1)
469470
GSASIIpath.InstallGitBinary(tarURL, installLoc, nameByVersion=True)
470471
msg = f'Binaries installed from {tarURL} to {installLoc}\n'
471472
print(msg)

0 commit comments

Comments
 (0)