Skip to content

Commit ee3fa27

Browse files
committed
Use zip for the artifact because HotCRP
1 parent ec0da4f commit ee3fa27

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

artifact/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
README.html
2-
30.tar.gz
2+
argosy-artifact.zip

artifact/checksum.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66

77
echo "The artifact provides an option of using a VM argosy-vm.ova for dependencies; its md5 is also below."
88
echo '```'
9-
md5sum 30.tar.gz
9+
md5sum argosy-artifact.zip
1010
cd vm/argosy-vm-ova
1111
md5sum argosy-vm.ova
1212
echo '```'

artifact/prepare.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
src="$1"
66
out="/tmp/argosy-artifact"
7+
out_dir="$PWD"
78

89
if [ -z "$src" ]; then
910
echo "Usage: $0 <path to argosy src>"
@@ -22,9 +23,16 @@ pushd "$out"
2223
tar -xf argosy.tar.gz
2324
rm argosy.tar.gz
2425

26+
# package up the rest of the artifact
2527
cp "$src/artifact/README.html" ./
2628
cp "$src/artifact/loc.sh" ./
2729
popd
2830
find "$out" -type f -name '._*' -delete
29-
tar -czvf "30.tar.gz" -C $(dirname "$out") $(basename "$out")
31+
32+
# Note that the uploaded artifact needs to be a zip file because HotCRP
33+
# doesn't preserve the tar part of the filename for compressed tarballs.
34+
pushd "$out/.."
35+
rm -f "$out_dir/argosy-artifact.zip"
36+
zip -r "$out_dir/argosy-artifact.zip" $(basename "$out")
37+
popd
3038
rm -r "$out"

artifact/vm/scripts/setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
## install dependencies
66
# artifact dependencies
7-
sudo apt-get install -y opam cloc sqlite3
7+
sudo apt-get install -y opam cloc sqlite3 zip
88
# conveniences for VM
99
sudo apt-get install -y virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-utils vim firefox
1010

@@ -21,11 +21,11 @@ opam install -j2 -y coq.8.9.0
2121
## set up artifact
2222
# we do a build first to set up the stack cache
2323
cd /tmp
24-
tar -xf /tmp/argosy-artifact.tar.gz
24+
unzip /tmp/argosy-artifact.zip
2525
cd /tmp/argosy-artifact/argosy
2626
make -j2
2727
cd logging-client
2828
stack test
2929

3030
cd ~/
31-
tar -xf /tmp/argosy-artifact.tar.gz
31+
unzip /tmp/argosy-artifact.zip

artifact/vm/ubuntu-desktop.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
},
7979
{
8080
"type": "file",
81-
"source": "../30.tar.gz",
81+
"source": "../argosy-artifact.tgz",
8282
"destination": "/tmp/argosy-artifact.tar.gz"
8383
},
8484
{

0 commit comments

Comments
 (0)