Skip to content

Commit

Permalink
Merge pull request #16 from davidchristiany/singularity_version-3.6.0
Browse files Browse the repository at this point in the history
singularity v3.6.0
  • Loading branch information
lecorguille authored Jul 21, 2020
2 parents 03b9881 + 4b1dc22 commit a01d925
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
sudo: required
dist: trusty
dist: bionic

language: python
python: "2.7"
Expand Down
5 changes: 4 additions & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
---
# Singularity target version
singularity_version: "3.0.3"
singularity_version: "3.6.0"

singularity_conf_path: "/usr/local/etc/singularity/singularity.conf"

bind_paths: []
# example
# - /shared/home/
# - /shared/project/

#go variables
only_one_go_version: false
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
dependencies:
- role: gantsign.golang
version: 2.0.4
version: 2.4.0

galaxy_info:
role_name: singularity
Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- src: gantsign.golang
version: 2.0.4
version: 2.4.0
16 changes: 16 additions & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,22 @@
changed_when: False
failed_when: False

- name: singularity | get older go installation(s)
find:
paths: /opt/go/
file_type: directory
use_regex: yes
patterns: ['^(?!{{ golang_version }})1.[0-9]{1,2}(.[0-9]{1,2}|)$']
register: older_go_versions
when: only_one_go_version

- name: singularity | remove older Go installation(s)
file:
path: '{{ item.path }}'
state: absent
with_items: "{{ older_go_versions.files }}"
when: only_one_go_version

- name: singularity | install Go dependencies
command: go get -u -v github.com/golang/dep/cmd/dep
environment:
Expand Down
2 changes: 1 addition & 1 deletion tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
- ../../
vars:
golang_gopath: /opt/go/packages
singularity_version: "3.0.3"
singularity_version: "3.6.0"
5 changes: 3 additions & 2 deletions vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
# Default value for HPC
singularity_software_base:
- build-essential
- libssl-dev
- uuid-dev
- libgpgme11-dev
- libgpgme-dev
- squashfs-tools
- libseccomp-dev
- wget
- pkg-config
- git
- cryptsetup-bin
10 changes: 6 additions & 4 deletions vars/RedHat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
# Default value for HPC
singularity_software_base:
- '@Development tools'
- openssl-devel
- libuuid-devel
- gpgme-devel
- squashfs-tools
- openssl-devel
- libuuid-devel
- libseccomp-devel
- wget
- squashfs-tools
- cryptsetup

0 comments on commit a01d925

Please sign in to comment.