mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 10:18:12 +00:00
Code Issues Releases Wiki Activity
3831 commits 9 branches 139 tags 61 MiB
Commit graph

98 commits

Author SHA1 Message Date
Thomas Waldmann
963949812d vagrant: increase memory for parallel testing 
considering that we run pytest-xdist with 4 parallel processes,
we need a bit more RAM to avoid the OOM killer and MemoryError.

so, 1GiB for 32bit, 1.5GiB for 64bit VMs.
 2017-03-27 12:38:19 +02:00
Thomas Waldmann
c0dc644ef6 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	MANIFEST.in
#	Vagrantfile
#	docs/changes.rst
#	docs/usage/mount.rst.inc
#	src/borg/archiver.py
#	src/borg/fuse.py
#	src/borg/repository.py
 2017-01-29 05:49:53 +01:00
Thomas Waldmann
f74b533d6d vagrant: improve darwin64 VM settings 
somehow without these cpuid settings it does not work for everybody.
also nice if we can get away without the extensions pack, which is proprietary.
do not update iTunes, we just want the OS security / bugfix updates
 2017-01-28 16:56:14 +01:00
Thomas Waldmann
74c33463dc vagrant freebsd: some fixes, fixes #2067 
- use -RELEASE, it can be updated via binaries
- more RAM, otherwise the 4 workers run out of memory.
- do not install / use fakeroot, it seems broken.
- set a hostname, this VM has none
 2017-01-20 02:59:36 +01:00
Thomas Waldmann
7b9ff75960 use osxfuse 3.5.4 for tests / to build binaries 2017-01-19 19:02:13 +01:00
Thomas Waldmann
2b6e8a19e3 use python 3.5.3 to build binaries, fixes #2078 2017-01-19 18:58:14 +01:00
Thomas Waldmann
cdffd93139 pyinstaller: use fixed AND freshly compiled bootloader, fixes #2002 2017-01-17 02:09:28 +01:00
Thomas Waldmann
007d4797d8 pyinstaller: automatically builds bootloader if missing 2017-01-16 08:10:08 +01:00
Thomas Waldmann
1c3ec747d0 upgrade pyinstaller from 3.1.1+ to 3.2.1 2017-01-16 06:31:12 +01:00
Thomas Waldmann
740312f725 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	requirements.d/development.txt
#	tox.ini
 2017-01-15 01:15:04 +01:00
Thomas Waldmann
a9cd6a09cb fix the freebsd64 vagrant machine, fixes #2037 
The previous 10.2 got unusable due to missing backwards compatibility of 10.3 binaries it installed.
The 10.3 box from freebsd project has some issues:
- it needs "vagrant up" twice to start (first start with MAC warning)
- it needs shell set to sh
 2017-01-14 23:42:38 +01:00
Thomas Waldmann
70cc201377 Merge branch '1.0-maint' into merge-1.0-maint 2017-01-14 16:53:38 +01:00
Thomas Waldmann
00c7a4f886 vagrant: fix openbsd repo, fixes #2042 
original repo is 404.
 2017-01-14 14:12:39 +01:00
Marian Beermann
ecad0ed53a Merge branch '1.0-maint' into merge/1.0-maint 
# Conflicts: ... everywhere ...
#	.travis.yml
#	Vagrantfile
#	borg/testsuite/key.py
#	docs/changes.rst
#	docs/quickstart.rst
#	docs/usage.rst
#	docs/usage/upgrade.rst.inc
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/crypto.pyx
#	src/borg/helpers.py
#	src/borg/key.py
#	src/borg/remote.py
#	src/borg/repository.py
#	src/borg/testsuite/archive.py
#	src/borg/testsuite/archiver.py
#	src/borg/testsuite/crypto.py
#	src/borg/testsuite/helpers.py
#	src/borg/testsuite/repository.py
#	src/borg/upgrader.py
#	tox.ini
 2017-01-12 15:01:41 +01:00
Hartmut Goebel
0f7493299c Vagrantfile: Split cygwin packaged to be installed into base and project. 
The packages which are required for ssh log-in and rsync synchronized
folders to work are separated from those specific for the borg
project. This makes it easier to reuse in other projects.
 2017-01-08 22:16:54 +01:00
Thomas Waldmann
c412b86455 vagrant: add Python 3.6.0 2017-01-04 01:06:57 +01:00
Thomas Waldmann
c83a124e65 Merge branch '1.0-maint' (into master) 2016-11-28 02:23:32 +01:00
Thomas Waldmann
9643e64211 upgrade FUSE for macOS to 3.5.3 2016-11-27 02:09:19 +01:00
Thomas Waldmann
1dc51e6df8 Vagrantfile: reduce code duplication 2016-11-24 04:07:21 +01:00
Thomas Waldmann
6bb363c707 Vagrantfile: cosmetic: remove tabs / empty lines 2016-11-24 04:07:21 +01:00
Marian Beermann
05a52ec8ec
Merge branch '1.0-maint' into merge/1.0-maint 2016-11-09 23:56:54 +01:00
Thomas Waldmann
1b462cdbed vagrant: remove llfuse from tox.ini at a central place 2016-11-02 03:12:57 +01:00
TW
e38e4160ef Merge pull request #1780 from ThomasWaldmann/fix-centos6-testing 
vagrant: do not try to install llfuse on centos6
 2016-11-02 01:31:58 +01:00
ololoru
5b0bff1962 add windows virtual machine 
* Default memory size of Windows VM is 2048 mb
* Stop using mls-openssh and replace it with cygwin sshd by updating service start path in registry
 2016-10-31 11:37:57 -05:00
Thomas Waldmann
aa62a164d9 vagrant: do not try to install llfuse on centos6 
it breaks everything...
 2016-10-31 02:36:49 +01:00
Thomas Waldmann
09e74af7bf Merge branch '1.0-maint' 2016-10-24 21:41:20 +02:00
Thomas Waldmann
2b90e45dd1 vagrant: fix fuse permission issues on linux/freebsd, fixes #1544 2016-10-20 16:53:46 +02:00
Thomas Waldmann
57402b120b vagrant: no chown when rsyncing 
it tries to do chown -R vagrant.vagrant, but some boxes do not
have a vagrant group and break there. also, we do our own chown
in the provisioning scripts.
 2016-10-17 17:37:33 +02:00
Thomas Waldmann
63ff002b19 vagrant / netbsd: use own box, fixes #1671, fixes #1728 
self-made basic netbsd box includes pre-installed rsync as vagrant is unable to install rsync.
delete line from tox.ini with sed so it does not try to install llfuse (which is broken on netbsd).
 2016-10-17 02:03:52 +02:00
Thomas Waldmann
4ca0ed150b vagrant / openbsd: use own box, fixes #1695 
self-made basic openbsd box includes pre-installed rsync as vagrant is unable to install rsync.
as the self-made box now has enough space on /, remove workaround for low space.
delete line from tox.ini with sed so it does not try to install llfuse (which is broken on openbsd).
 2016-10-15 15:21:38 +02:00
Thomas Waldmann
b0cc4fd74a Merge branch '1.0-maint' into merge-1.0-maint 2016-10-13 19:10:04 +02:00
Björn Ketelaars
a0df60e1b8 FUSE on OpenBSD 
Concerning #1696:

OpenBSD offers in kernel support for FUSE 2.6. Borg relies on llfuse,
which relies on FUSE >2.9.

I'm not aware of plans to bring FUSE on OpenBSD to a more recent
version.

Signed-off-by: Björn Ketelaars <bjorn.ketelaars@hydroxide.nl>
 2016-10-10 01:07:30 +02:00
Thomas Waldmann
75624f8e05 vagrant: update image name of boxcutter debian7 boxes 
debian711* is 404.
 2016-10-06 22:58:02 +02:00
Thomas Waldmann
864333d686 pyinstaller: use a spec file to build borg.exe binary 
also: exclude osxfuse dylib on Mac OS X
 2016-10-02 00:43:45 +02:00
Marian Beermann
5baf749b29 vagrant freebsd64: fix tox not finding any pythons 2016-10-01 20:17:30 +02:00
Thomas Waldmann
186223ddef Merge branch '1.0-maint' into merge-1.0-maint 2016-09-27 23:21:46 +02:00
Thomas Waldmann
4838b9e110 vagrant: upgrade osxfuse to 3.5.2 2016-09-27 22:44:33 +02:00
Thomas Waldmann
2a864be84f Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	setup.py
#	src/borg/archiver.py
#	src/borg/helpers.py
 2016-09-27 21:31:41 +02:00
Thomas Waldmann
bb6c0cd2ac vagrant: update FUSE for macOS 2016-09-26 20:08:04 +02:00
enkore
38f217d76f Merge pull request #1597 from ThomasWaldmann/fresh-bootloader 
Vagrantfile: use TW's fresh-bootloader branch
 2016-09-14 20:26:28 +02:00
Thomas Waldmann
322d217677 Vagrantfile: use TW's fresh-bootloader branch 
... until pyinstaller team catches up, merges the fixes and recompiles the bootloader.
 2016-09-14 03:11:11 +02:00
Thomas Waldmann
1287d1ae92 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	docs/development.rst
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/hashindex.pyx
#	src/borg/testsuite/hashindex.py
 2016-09-14 02:53:41 +02:00
Thomas Waldmann
3c3502a9a0 update wheezy vagrant box to 7.11 
7.9 is not available any more.
 2016-09-14 02:22:46 +02:00
Thomas Waldmann
2cfd905347 Vagrant: pyinstaller: use pre-built linux bootloaders, fixes #1506 2016-08-22 18:49:03 +02:00
Thomas Waldmann
821fba8cb0 use patched LDLP-preserving pyinstaller, fixes #1416 
see https://github.com/pyinstaller/pyinstaller/pull/2148

also: use waf --no-lsb (the bootloader does not build without it on our wheezy32 vagrant VM)
 2016-08-20 12:30:26 +02:00
Thomas Waldmann
dbe862f3d8 Merge branch '1.0-maint' into merge-1.0-maint 2016-08-06 01:24:22 +02:00
Thomas Waldmann
b5d605e5aa Vagrantfile: use FUSE for macOS 3.4.1 
Note: "FUSE for OS X" was renamed to "FUSE for macOS".
 2016-08-03 18:23:43 +02:00
Thomas Waldmann
4e737cb64b OS X: install pkg-config to build with FUSE support 2016-07-30 21:08:20 +02:00
Marian Beermann
ac8c8119a7
Merge branch '1.0-maint' into master 2016-07-28 00:29:43 +02:00
Pankaj Garg
5f713ec1c1 Fixed the issue of xenial64 box being unable to run because vagrant user is absent 2016-07-15 09:15:37 +05:30