From 70c57210d4fbdb530f606e853ffb2832422bbb18 Mon Sep 17 00:00:00 2001 From: Kartavya Vashishtha Date: Wed, 13 Dec 2023 11:05:25 -0500 Subject: [PATCH] change release to v1.2 test release binaries in build-release.sh overwrite existing example_inputs when extracting --- Dockerfile | 2 +- build-dockerfile.sh | 2 +- build-release.sh | 22 ++++++++++++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63aab1a..7c3de39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update && \ RUN Rscript -e 'install.packages(c("tidyverse", "umap", "ggrastr", "pins", "rmarkdown"))' WORKDIR /app -COPY --from=build /app/librarian_v1.1 ./ +COPY --from=build /app/librarian_v1.2 ./ RUN mkdir /app/out LABEL org.opencontainers.image.source https://github.com/DesmondWillowbrook/Librarian diff --git a/build-dockerfile.sh b/build-dockerfile.sh index 1fb58be..c7db807 100755 --- a/build-dockerfile.sh +++ b/build-dockerfile.sh @@ -5,7 +5,7 @@ sudo hwclock --hctosys # to sync time between host and WSL2 podman build -t ghcr.io/desmondwillowbrook/librarian . cd frontend/example_inputs/ -unzip example_inputs.zip +unzip -o example_inputs.zip cd - # try running the container diff --git a/build-release.sh b/build-release.sh index 9f7456c..7aa458a 100755 --- a/build-release.sh +++ b/build-release.sh @@ -14,5 +14,23 @@ mkdir -p $RELEASE_PATH # z tells it to use gzip # f tells it the archive to save to # -C changes directory, affects subsequent directory changes as well -tar --transform 's,^,librarian_v1.1/,' -czf $RELEASE_PATH/librarian.tar.gz -C server scripts -C ../target/x86_64-unknown-linux-musl/release librarian -tar --transform 's,^,librarian_v1.1/,' -czf $RELEASE_PATH/server.tar.gz -C server scripts -C ../target/x86_64-unknown-linux-musl/release server \ No newline at end of file +tar --transform 's,^,librarian_v1.2/,' -czf $RELEASE_PATH/librarian.tar.gz -C server scripts -C ../target/x86_64-unknown-linux-musl/release librarian +tar --transform 's,^,librarian_v1.2/,' -czf $RELEASE_PATH/server.tar.gz -C server scripts -C ../target/x86_64-unknown-linux-musl/release server + +cd frontend/example_inputs/ +unzip -o example_inputs.zip +cd - + +cd $RELEASE_PATH +tar -xf librarian.tar +./librarian_v1.2/librarian ../frontend/example_inputs/example_inputs/ATAC.example.fastq --local --raw --output-dir=. + +# check whether the files are non-empty +test -s librarian_heatmap.txt + +# check whether the files are recent +test `find librarian_heatmap.txt -mmin -1` + +rm librarian_heatmap.txt + +cd - \ No newline at end of file