Skip to content

Commit 3a5a049

Browse files
committed
ensuring that correct recipe name is used, and updating travis for newer singularity dependencies (libarchive-dev)
1 parent f1f241f commit 3a5a049

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.travis/before_install

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ sudo apt-get update && sudo apt-get install -y wget git build-essential squashfs
66
automake \
77
autoconf \
88
uuid-dev \
9-
libssl-dev
9+
libssl-dev \
10+
libarchive-dev
1011

1112

1213
sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
@@ -34,6 +35,6 @@ cd $TRAVIS_BUILD_DIR && sudo python -m pip install -r requirements.txt
3435
python setup.py sdist && python setup.py install
3536
pylint --version
3637

37-
# Install Singularity (development)
38-
cd /tmp && git clone -b development https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
38+
# Install Singularity
39+
cd /tmp && git clone https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
3940

singularity/build/google.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,8 @@ def run_build(logfile='/tmp/.shub-log'):
238238

239239
# Output includes:
240240
finished_image = output['image']
241-
finished_recipe = '/%s/Singularity' %build_dir
241+
finished_recipe = '/%s/%s' %(build_dir, os.path.basename(params['spec_file']))
242+
bot.info('Recipe to upload to storage %s' %finished_recipe)
242243
metadata = output['metadata']
243244
params = output['params']
244245

0 commit comments

Comments
 (0)