Skip to content

Commit

Permalink
updating files for 2.6.0 release candidate 1
Browse files Browse the repository at this point in the history
  • Loading branch information
GodloveD committed Jul 10, 2018
1 parent 98d4157 commit 4122956
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ and changes prior to that are (unfortunately) done retrospectively. Critical ite
- migration guidance (how to convert images?)
- changed behaviour (recipe sections work differently)

## [v2.6.0]
## [v2.6.0-rc1]

### Implemented enhancements
- Allow admin to specify a non-standard location for mksquashfs binary at
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
AC_INIT([singularity],[2.5.2],[gmkurtzer@gmail.com])
AC_INIT([singularity],[2.5.99],[gmkurtzer@gmail.com])

This comment has been minimized.

Copy link
@DrDaveD

DrDaveD Jul 11, 2018

Collaborator

Was this commit added without a pull request?

It has caused the Debian travis builds to fail.

This comment has been minimized.

Copy link
@GodloveD

GodloveD Jul 11, 2018

Author Collaborator

Yes. I usually increment the version numbers without a PR. I'm looking at the travis problem right now. I think it's just an issue in Travis and not an issue with the commit.

This comment has been minimized.

Copy link
@GodloveD

GodloveD Jul 11, 2018

Author Collaborator

Actually, on closer inspection I think you are right and the creative versioning number scheme I tried to employ did break the debian build. I just pushed a new commit to try to fix this.

We always get into weird corner cases when we try to come up with version numbers for release candidates.


if test -z "$prefix" -o "$prefix" = "NONE" ; then
prefix=${ac_default_prefix}
Expand Down
15 changes: 15 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
singularity-container (2.6.0-rc1-1) unstable; urgency=high

* Allow admin to specify a non-standard location for mksquashfs binary at
* build time with --with-mksquashfs option
* --nv option will use [nvidia-container-cli](https://github.com/NVIDIA/libnvidia-container) if installed
* [nvliblist.conf](https://github.com/singularityware/singularity/blob/master/etc/nvliblist.conf) now has a section for binaries
* --nv can be made default with all action commands in singularity.conf
* --nv can be controlled by env vars `$SINGULARITY_NV` and `$SINGULARITY_NV_OFF`
* Refactored travis build and packaging tests
* Added build and packaging tests for Debian 8/9 and openSUSE 42.3/15.0
*

This comment has been minimized.

Copy link
@DrDaveD

DrDaveD Jul 11, 2018

Collaborator

Is this supposed to be a complete list? For example the shim init #1221 PR isn't included here.

This comment has been minimized.

Copy link
@GodloveD

GodloveD Jul 11, 2018

Author Collaborator

Ah. Great catch. I should go through and see what others may have been missed.

* Fix 404 when using Arch Linux bootstrap #1731

-- Gregory M. Kurtzer <gmkurtzer@gmail.com> Tue, 10 Jul 2018 18:01:00 -0700

singularity-container (2.5.2-1) unstable; urgency=high

* Removed the option to use overlay images with `singularity mount`. This
Expand Down

0 comments on commit 4122956

Please sign in to comment.