Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
339768d
Fix history on master.
JamesAPetts Oct 15, 2020
7c6ee75
2020 10 20 crosshairs merge (#10)
pieper Oct 20, 2020
54812b8
Start to set up IDC deployment
wlongabaugh Nov 25, 2020
b442940
tweak CircleCI
wlongabaugh Nov 25, 2020
381d283
Merge pull request #11 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 25, 2020
d98c561
fix config
wlongabaugh Nov 25, 2020
702fb4a
Merge pull request #12 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 25, 2020
59c2cd5
Comment out unused script
wlongabaugh Nov 25, 2020
fb61455
Add to build steps
wlongabaugh Nov 25, 2020
8c01e2a
Merge pull request #13 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 25, 2020
d06da03
Fix support checkout
wlongabaugh Nov 25, 2020
8db6d12
Merge pull request #14 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 25, 2020
4c9f12b
Debug checkout
wlongabaugh Nov 25, 2020
541dd6b
Merge pull request #15 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 25, 2020
274a224
Fix Support
wlongabaugh Nov 25, 2020
13b8432
Merge pull request #16 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 25, 2020
4444457
Start working on deploy
wlongabaugh Nov 26, 2020
b1fdcfd
Merge pull request #17 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 26, 2020
be2e043
Finalizing deploy
wlongabaugh Nov 26, 2020
576b454
Fix path
wlongabaugh Nov 26, 2020
d440150
Merge pull request #18 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 26, 2020
2c23495
add chmod
wlongabaugh Nov 26, 2020
8a39b8d
Merge pull request #20 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 26, 2020
a682b52
debug
wlongabaugh Nov 28, 2020
aed66d8
Merge pull request #21 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
81e1ef6
debug
wlongabaugh Nov 28, 2020
5c2cd3b
Merge pull request #22 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
24886e6
debug
wlongabaugh Nov 28, 2020
f436fec
Merge pull request #23 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
bfecf3e
debug
wlongabaugh Nov 28, 2020
5296a94
Merge pull request #24 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
ad35510
debug
wlongabaugh Nov 28, 2020
f6654ea
Merge pull request #25 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
2f15165
debug
wlongabaugh Nov 28, 2020
82d1019
Merge pull request #26 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
1858d80
debug
wlongabaugh Nov 28, 2020
7d6396c
Merge pull request #27 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
2dbccf3
debug
wlongabaugh Nov 28, 2020
6d27b5a
Merge pull request #28 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
592c345
debug
wlongabaugh Nov 28, 2020
320a965
Merge pull request #29 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
5d888ea
debug
wlongabaugh Nov 28, 2020
3e06535
Merge pull request #30 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
b7dcce9
debug
wlongabaugh Nov 28, 2020
30c69a0
Merge pull request #31 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
c624d96
debug
wlongabaugh Nov 28, 2020
9a8c1ee
Merge pull request #32 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
fed2cbd
remove debug, prepare to finalize
wlongabaugh Nov 28, 2020
3a3c1af
Merge pull request #33 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
cfcb8fe
guarantee directory existence
wlongabaugh Nov 28, 2020
7db0c2b
Merge pull request #34 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 28, 2020
3a75aa2
make build optional
wlongabaugh Nov 29, 2020
81b27bf
Merge pull request #35 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 29, 2020
3ef34f2
need sdk
wlongabaugh Nov 29, 2020
0ab9223
Merge pull request #36 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 29, 2020
e699f12
fix name
wlongabaugh Nov 29, 2020
fc2f760
Merge pull request #37 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 29, 2020
8ba5f87
fix string comparisons
wlongabaugh Nov 29, 2020
9c46b87
Merge pull request #38 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 29, 2020
294ea18
fix arg
wlongabaugh Nov 30, 2020
63c8a3f
Merge pull request #39 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 30, 2020
3e05318
debug
wlongabaugh Nov 30, 2020
0fa1760
Merge pull request #40 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 30, 2020
17a5c62
remove debug
wlongabaugh Nov 30, 2020
b62f561
Merge pull request #41 from ImagingDataCommons/wjrl-dev
wlongabaugh Nov 30, 2020
05715c5
make config link configurable
wlongabaugh Dec 1, 2020
8927efc
Merge pull request #42 from ImagingDataCommons/wjrl-dev
wlongabaugh Dec 1, 2020
1a393cb
Fix history on master.
JamesAPetts Oct 15, 2020
30920aa
2020 10 20 crosshairs merge (#10)
pieper Oct 20, 2020
4680cf2
Merge branch 'master' into sandbox
Punzo Dec 8, 2020
0a361d5
Merge pull request #44 from ImagingDataCommons/sandbox
wlongabaugh Dec 8, 2020
e9f65df
Add in test and prod
wlongabaugh Dec 8, 2020
cf1d2c0
Merge pull request #45 from ImagingDataCommons/wjrl-dev
wlongabaugh Dec 8, 2020
49b220b
Force update
wlongabaugh Dec 8, 2020
96f1a8e
Fix build conditions
wlongabaugh Dec 8, 2020
0007182
Merge pull request #47 from ImagingDataCommons/idc-test-wjrl
wlongabaugh Dec 8, 2020
1066553
Merge remote-tracking branch 'upstream/master' into sandbox
Punzo Dec 10, 2020
1bd46ce
Merge pull request #50 from ImagingDataCommons/sandbox
wlongabaugh Dec 10, 2020
c7d0d06
Merge remote-tracking branch 'upstream/master' into sandbox
Punzo Dec 10, 2020
f79af52
Merge pull request #51 from ImagingDataCommons/sandbox
wlongabaugh Dec 10, 2020
ac68143
Force
wlongabaugh Jan 4, 2021
a14ee49
Merge pull request #56 from ImagingDataCommons/wjrl-dev
wlongabaugh Jan 4, 2021
f27ebdc
Merge branch 'master' of github.com:OHIF/Viewers into sandbox
igoroctaviano Jan 21, 2021
292166b
Sandbox (#57)
igoroctaviano Jan 26, 2021
a12ed99
Force
wlongabaugh Jan 26, 2021
4c3fc86
Merge pull request #58 from ImagingDataCommons/wjrl-dev
wlongabaugh Jan 26, 2021
fe4da39
Force
wlongabaugh Jan 26, 2021
b851b0a
Merge pull request #59 from ImagingDataCommons/wjrl-dev
wlongabaugh Jan 26, 2021
59d0330
Merge branch 'master' of github.com:OHIF/Viewers into sandbox
igoroctaviano Feb 8, 2021
6a606bc
Merge branch 'master' of github.com:ImagingDataCommons/Viewers into s…
igoroctaviano Feb 11, 2021
065c0f5
Merge pull request #60 from ImagingDataCommons/sandbox
igoroctaviano Feb 11, 2021
3318300
Merge branch 'master' of github.com:OHIF/Viewers into fix/bump-dcmjs
igoroctaviano Feb 25, 2021
44bf5f3
Merge pull request #62 from ImagingDataCommons/fix/bump-dcmjs
igoroctaviano Feb 25, 2021
22eba34
Merge branch 'master' of github.com:OHIF/Viewers into fix/bump-dcmjs
igoroctaviano Feb 25, 2021
8ea3673
Merge pull request #63 from ImagingDataCommons/fix/bump-dcmjs
igoroctaviano Feb 25, 2021
b7fe44a
Merge branch 'master' of github.com:OHIF/Viewers into update/ohif-4-9-0
igoroctaviano Mar 4, 2021
d38c867
Merge pull request #66 from ImagingDataCommons/update/ohif-4-9-0
igoroctaviano Mar 4, 2021
8a4d500
Merge pull request #67 from OHIF/master
Punzo Mar 9, 2021
75c88ca
Merge pull request #68 from OHIF/master
wlongabaugh Mar 25, 2021
d79b91c
Merge pull request #71 from OHIF/master
wlongabaugh Mar 31, 2021
6eeb115
Update Install CloudSDK
wlongabaugh Mar 31, 2021
bb505d7
Merge pull request #73 from ImagingDataCommons/wjrl-dev
wlongabaugh Mar 31, 2021
4534715
Merge pull request #75 from OHIF/master
wlongabaugh Mar 31, 2021
9e4283c
Force output
wlongabaugh Mar 31, 2021
3467a30
newline
wlongabaugh Mar 31, 2021
0e9fdf9
Create pings for build output
wlongabaugh Mar 31, 2021
14dcec3
Newline
wlongabaugh Mar 31, 2021
70869d6
Merge pull request #77 from ImagingDataCommons/wjrl-dev
wlongabaugh Mar 31, 2021
f6ad82b
Test for empty PID
wlongabaugh Mar 31, 2021
0e18419
Merge pull request #78 from ImagingDataCommons/wjrl-dev
wlongabaugh Mar 31, 2021
2d07a30
Force for config change
wlongabaugh Apr 14, 2021
cc71a66
Merge pull request #79 from ImagingDataCommons/wjrl-dev
wlongabaugh Apr 14, 2021
9473c8b
Add hook to map cornestone tools from ccc srs
igoroctaviano Apr 19, 2021
c8d6a78
Fix viewer retrieve loading of studies to wait srs to load properly
igoroctaviano Apr 19, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 69 additions & 69 deletions .circleci/build-and-publish-docs.sh
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
#!/bin/bash

# Set directory to location of this script
# https://stackoverflow.com/a/3355423/1867984
cd "$(dirname "$0")"

yarn -v
node -v

echo 'Installing Gitbook CLI'

yarn global bin
yarn config get prefix
yarn config set prefix ~/.yarn
export PATH="$PATH:`yarn global bin`"

echo 'Running Gitbook installation'

# Generate all version's GitBook output
# For each directory in /docs ...
cd ./../docs/
for D in *; do
if [ -d "${D}" ]; then

echo "Generating output for: ${D}"
cd "${D}"

# Clear previous output, generate new
rm -rf _book
gitbook install
gitbook build

cd ..

fi
done

# Move CNAME File into `latest`
cp CNAME ./latest/_book/CNAME

# Create a history folder in our latest version's output
mkdir ./latest/_book/history

# Move each version's files to latest's history folder
for D in *; do
if [ -d "${D}" ]; then
if [ "${D}" == v* ] ; then

echo "Moving ${D} to the latest version's history folder"

mkdir "./latest/_book/history/${D}"
cp -v -r "./${D}/_book"/* "./latest/_book/history/${D}"

fi
fi
done

# Back to repo root
cd ..

echo "Done generating documentation output"
echo 'STARTING PUBLISH'

# WILL ALWAYS FAIL IF INITIATED FROM PR BRANCH
npx gh-pages \
--silent \
--repo https://[email protected]/OHIF/Viewers.git \
--message 'Autogenerated Message: [ci skip]' \
--dist docs/latest/_book
##!/bin/bash
#
## Set directory to location of this script
## https://stackoverflow.com/a/3355423/1867984
#cd "$(dirname "$0")"
#
#yarn -v
#node -v
#
#echo 'Installing Gitbook CLI'
#
#yarn global bin
#yarn config get prefix
#yarn config set prefix ~/.yarn
#export PATH="$PATH:`yarn global bin`"
#
#echo 'Running Gitbook installation'
#
## Generate all version's GitBook output
## For each directory in /docs ...
#cd ./../docs/
#for D in *; do
# if [ -d "${D}" ]; then
#
# echo "Generating output for: ${D}"
# cd "${D}"
#
# # Clear previous output, generate new
# rm -rf _book
# gitbook install
# gitbook build
#
# cd ..
#
# fi
#done
#
## Move CNAME File into `latest`
#cp CNAME ./latest/_book/CNAME
#
## Create a history folder in our latest version's output
#mkdir ./latest/_book/history
#
## Move each version's files to latest's history folder
#for D in *; do
# if [ -d "${D}" ]; then
# if [ "${D}" == v* ] ; then
#
# echo "Moving ${D} to the latest version's history folder"
#
# mkdir "./latest/_book/history/${D}"
# cp -v -r "./${D}/_book"/* "./latest/_book/history/${D}"
#
# fi
# fi
#done
#
## Back to repo root
#cd ..
#
#echo "Done generating documentation output"
#echo 'STARTING PUBLISH'
#
## WILL ALWAYS FAIL IF INITIATED FROM PR BRANCH
#npx gh-pages \
# --silent \
# --repo https://[email protected]/OHIF/Viewers.git \
# --message 'Autogenerated Message: [ci skip]' \
# --dist docs/latest/_book
Loading