Skip to content

Commit 3a5be0a

Browse files
committed
update GSAS2PKG; remove unused files
1 parent c4bbdef commit 3a5be0a

33 files changed

+209
-1419
lines changed

.github/workflows/gsas2pkg.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ jobs:
5353
shell: bash -l {0}
5454
run: |
5555
cd install
56-
conda build g2pkg -c conda-forge --numpy 1.26 --output-folder ../build
56+
python gsas2pkg/makeBldFiles.py
57+
#conda build g2pkg -c conda-forge --numpy 1.26 --output-folder ../build
58+
conda build g2pkg -c conda-forge --output-folder ../build
5759
#if [ "$RUNNER_OS" == "macOS" ]; then
5860
# conda convert ../build/osx-arm64/gsas2pkg-*.conda -p osx-64 -o ../build
5961
#ls -ltR ../build

install/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
local_buildGSAS2main.sh
22
token_generation.rtfd
3+
windows_notes.txt

install/Jenkins_build_scripts/Linux64.sh

Lines changed: 0 additions & 162 deletions
This file was deleted.

install/Jenkins_build_scripts/MacOS64.sh

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)