Commit Graph

310 Commits

Author SHA1 Message Date
Joseph Yasi cc93d553d8 Quote some more MySQL8 Reserved keywords
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
2020-07-10 23:11:59 +02:00
Isaac Connor 2db65d3821 Merge branch 'release-1.34' 2020-07-04 09:09:24 -04:00
Isaac Connor 88f3565c0a reduce verbosity of rsync 2020-07-02 17:17:44 -04:00
Isaac Connor 9b4a753194 deprecate ubuntu disco 2020-06-09 14:20:35 -04:00
Isaac Connor 4cf7c1a16e deprecate trusty and precise. Use new cleaned up rules for focal and buster 2020-04-23 15:02:00 -04:00
Isaac Connor fc5080d9c7 deprecate support for trusty and disco 2020-04-14 17:30:16 -04:00
Isaac Connor 2f0b991761 If can't determine latest stable release, then quit 2020-03-30 10:05:19 -04:00
Isaac Connor 0b5ebbbe59 add focal to ubuntu builds 2020-03-24 14:56:25 -04:00
Isaac Connor 4479029e27 When doing a release, reploy to debian/release-VERSION instead of master. 2020-02-06 14:46:26 -05:00
Isaac Connor 83411cd6f2 fix zmrepo dest dir when doing a proper release 2020-02-06 14:45:38 -05:00
Isaac Connor 8e604afb58 actually copy *.buildinfo when deploying 2020-01-21 17:21:43 -05:00
Isaac Connor c0443f694a I think we need .buildinfo as well 2020-01-07 12:24:39 -05:00
Andrew Bauer 2956e5e156 use dnf rather than yum for newer redhat distros 2020-01-05 14:30:33 -06:00
Andrew Bauer 0fb806d9d7
Allow aarch64 as a valid build architecture 2020-01-04 15:30:32 -06:00
adam ce7b62c825 Fixed unquoted variable which was failing to correctly detect error case
This was discovered when there was a DNS failure (it's always DNS) and
it caused a syntax error on line 178.  I changed it to use -z to check
for a zero length string, as suggested by the man page.  Putting $VERSION
in double quotes would also be a valid fix.

Here's what the script looks like when it fails:

./do_debian_package.sh --snapshot=stable --type=local --interactive=no
Doing local build
Defaulting to bionic for distribution
Defaulting to ZoneMinder upstream git
fatal: not a git repository (or any of the parent directories): .git
fatal: not a git repository (or any of the parent directories): .git
Latest stable branch is
git clone https://github.com/ZoneMinder/ZoneMinder.git ZoneMinder_zoneminder_release
Cloning into 'ZoneMinder_zoneminder_release'...
fatal: unable to access 'https://github.com/ZoneMinder/ZoneMinder.git/': Could not resolve host: github.com
./do_debian_package.sh: line 172: cd: ZoneMinder_zoneminder_release: No such file or directory
fatal: not a git repository (or any of the parent directories): .git
cat: ZoneMinder_zoneminder_release/version: No such file or directory
./do_debian_package.sh: line 178: [: ==: unary operator expected
Doing local release zoneminder_
mv: cannot stat 'ZoneMinder_zoneminder_release': No such file or directory
Error status code is: 0
Setting up build dir failed.
2019-12-29 14:13:49 -06:00
Andrew Bauer 77f026a389 exclude external-repo.noarch.rpm during deployments 2019-12-27 09:12:49 -06:00
Andrew Bauer 28a6e71992 deploy raspbian builds to debian target folder 2019-12-27 09:04:02 -06:00
Andrew Bauer 3bc1543f9e build rpms on every commit 2019-12-26 19:36:33 -06:00
Andrew Bauer 5bd353928e update rsync text 2019-12-25 09:05:50 -06:00
Andrew Bauer aa0dc4729b exit immediately if deploy host does not respond 2019-12-25 08:45:10 -06:00
Andrew Bauer 73aba586d4 move eslint into env matrix + other build tweaks 2019-12-25 08:41:53 -06:00
Andrew Bauer 635988f0cc use quotes for correctness 2019-12-23 17:13:38 -06:00
Andrew Bauer f3116589e3 replace sshfs with rsync for all deployments 2019-12-23 17:08:57 -06:00
Isaac Connor 0f8d2faa6f Just use return code from rsync. We don't mind it's verbose output being always output. 2019-11-20 14:21:01 -05:00
Isaac Connor e4c23c3100 crank of the verbosity. Add another rsync call just to test if output is not being reported to travis 2019-11-19 09:36:43 -05:00
Isaac Connor 7868d969ce add -v to rsync 2019-11-18 17:59:10 -05:00
Isaac Connor d9e3f21ba1 Turn off controlmaster to see if that is what is causing us trouble with rsync 2019-11-18 17:02:30 -05:00
Isaac Connor 627adf5a1f do the .deb installation and test on xenial instead of trusty 2019-11-18 14:35:26 -05:00
Isaac Connor efdba5a50f add ssh -v to rsync command so we can figure out why it isn't working 2019-11-18 14:31:32 -05:00
Isaac Connor 2bf9852404 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-20 11:44:22 -04:00
Isaac Connor bf69e053b4 Add SNAPTSHOT=CURRENT to build with the commit # in the version string 2019-10-20 11:44:19 -04:00
Isaac Connor c240767727 Add eoan to distros 2019-10-20 11:41:55 -04:00
Isaac Connor 3b31381a57 remove unneeded quotes. 2019-10-12 11:15:20 -04:00
Isaac Connor 29a8cd3c91 use rsync instead of sftp 2019-10-09 13:00:29 -04:00
Isaac Connor af6ead60a5 Add USE_SFTP option to rsync_xfer to just use sftp install of sshfs to copy files over to zmrepo 2019-10-08 12:31:01 -04:00
Andrew Bauer 2c22a4727f
Update rsync_xfer.sh 2019-09-30 10:39:29 -05:00
Andrew Bauer 9ba8f5c7ff
Update rsync_xfer.sh 2019-09-30 10:31:21 -05:00
Isaac Connor d4a8c96ede Build and deploy packages for every commit for debian/ubuntu/raspbian 2019-09-23 13:10:14 -04:00
Isaac Connor 96024b518e Do per commit builds for debian and ubuntu 2019-09-22 13:02:13 -04:00
Isaac Connor 0ec215c95f Only try to install deb on trusty as that is the environment that travis is running 2019-09-22 12:52:46 -04:00
Isaac Connor cb194cc4d1 enable per commit builds for buster so I can test my docker image for it 2019-09-20 14:14:56 -04:00
Isaac Connor 16a7ab1392 Attempt to deploy any deb basesd distro, not just trusty 2019-09-13 08:21:19 -04:00
Isaac Connor e6351109b2 Now that we are using our fork of packpack, no longer need to patch it 2019-09-06 12:00:50 -04:00
Isaac Connor c58cb38233 Add some debug echos, fix zmfilter command line and remove -1 from changelog version, as packpack version wont' have it. 2019-09-06 11:25:21 -04:00
Isaac Connor 4634cb63e5 Use ZoneMinder's fork of packpack. Use isaac@zoneminder.com instead of personal email. set DISTRO in changelog 2019-09-06 09:31:08 -04:00
Isaac Connor 479e7c290c cosmic is unsupported, don't build for it by default 2019-08-01 09:51:03 -04:00
Isaac Connor 3d2f806699 Merge branch 'master' of github.com:connortechnology/ZoneMinder 2019-07-08 12:59:00 -04:00
Isaac Connor 8cf7563ce4 fix merge 2019-06-24 12:00:19 -04:00
Isaac Connor 148a48a861 Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2019-06-24 11:59:08 -04:00
Isaac Connor ee19322e11 update do_debian_package from storageareas 2019-06-24 11:57:52 -04:00
Isaac Connor 1815bf18a9 Add support for specifying PPA 2019-06-24 11:55:38 -04:00
Isaac Connor 5a0b30efd5 escape $ 2019-06-21 10:19:48 -04:00
Isaac Connor df19e98f28 Add auto dput when interactive==no 2019-05-28 10:59:58 -04:00
Isaac Connor 3b045f3958 when release is a 1.30, then use the old stable ppa 2019-02-22 10:48:42 -05:00
Isaac Connor 5496f6afac add cosmic and disco to ubuntu builds 2018-11-29 10:48:16 -05:00
Isaac Connor 633fbfc5b4 rework release mode. When doing a release, we cannot regenerate the .orig tarball for each distro. It has to be the same or else the ppa will reject any further uploads. So now the distro command line parameter can be a comma separated list of distros to build for and will default to xenial,bionic,trusty 2018-10-03 13:03:44 -04:00
Isaac Connor 5f89931774 Add grabbing original source tarball from github and overwriting the generated tarball with it. 2018-10-02 15:53:32 -04:00
Isaac Connor 7ac955d005 further changes to ensure that source .orig tarball is always the same 2018-09-26 16:44:04 -04:00
Isaac Connor 89cd7ceaf8 Whitespace, extra parentheses, google code style 2018-09-23 16:47:06 -04:00
Andrew Bauer 284d622464 update the way we access mapped mem in zm-alarm.pl 2018-09-19 12:06:09 -05:00
Andrew Bauer 7ef9cf4231
typo 2018-09-13 20:13:06 -05:00
Andrew Bauer 9f61043931
Update startpackpack.sh 2018-07-12 07:59:27 -05:00
Andrew Bauer d91167e648
fix zmeditcongifdata.sh
configdata.sh.in uses single quotes now. Update zmeditconfigdata search pattern accordingly.
2018-07-03 15:30:11 -05:00
Andrew Bauer d7a5940507 build system - use different output filters for arm 2018-06-14 07:16:14 -05:00
Andrew Bauer 4b78d85b14
build system - additional key phrases to filter on 2018-06-13 15:56:12 -05:00
Andrew Bauer 4f26301ff0
filter build output to avoid travis build failures
Change the way we output our build text during travis builds.  This commit will strip out lines with specific keywords.
2018-06-13 15:44:31 -05:00
Isaac Connor d5fedd5470 Update to add cache dir config and api configs 2018-04-27 11:25:01 -04:00
Andrew Bauer 426b3cf9d4
Update startpackpack.sh 2018-04-24 12:43:45 -05:00
Andy Bauer f13d174ea5 remove support for el6 from the buildsystem 2018-04-21 21:49:04 -05:00
Andrew Bauer 4f7e0fedad
Update startpackpack.sh 2018-04-21 18:50:46 -05:00
Andrew Bauer db293944c3
Update startpackpack.sh 2018-04-21 18:49:35 -05:00
Andy Bauer 287eb330eb add network connectivity checks to zmrepo 2018-04-21 08:37:27 -05:00
Andrew Bauer 519c36ae7d
Update startpackpack.sh 2018-04-20 21:24:49 -05:00
Andrew Bauer 779e77ac29
Update startpackpack.sh 2018-04-20 21:12:15 -05:00
Andrew Bauer 782d237b2d
Update startpackpack.sh 2018-04-20 21:10:24 -05:00
Andrew Bauer 8a61fb2532
redirect standard error when we mount zmrepo 2018-04-20 20:15:50 -05:00
Andrew Bauer 087fcc6c78
update buildsystem 2018-04-19 20:23:17 -05:00
Andrew Bauer 39244ac6ec
buildsystem update 2018-04-19 20:01:31 -05:00
Andrew Bauer a5cbc8abd1 buildsystem - update git submodules 2018-04-18 19:21:14 -05:00
Isaac Connor f682e1da9e Merge branch 'zmtelemetry_improvements' into storageareas 2018-03-21 10:40:32 -04:00
Andrew Bauer f60a6c4b4f
Roll packpack back to 7cf23ee
fix broken rpm builds
2018-03-20 19:34:27 -05:00
Isaac Connor b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05:00
Andrew Bauer 79037f56c1 buildsystem - fix 32bit rpm builds 2018-02-26 10:41:29 -06:00
Isaac Connor 3aa31fd524 Merge branch 'master' into storageareas 2018-02-23 10:23:35 -05:00
Andrew Bauer b19cb60540
update path in patch file (again) 2018-02-22 09:16:59 -06:00
Andy Bauer 7b9cb59df9 force no-lintian flag 2018-02-22 08:58:33 -06:00
Andrew Bauer 075f8d461c
Docker treats quotes literally in env-file
see: https://github.com/moby/moby/issues/11443#issuecomment-99198051
2018-02-21 17:15:18 -06:00
Andrew Bauer 8ef0386db2
adjust the path in the packpack patch file 2018-02-21 12:30:33 -06:00
Andrew Bauer b6ad2b6ad7 patch packpack to support custom environment vars 2018-02-21 12:15:10 -06:00
Andrew Bauer 4832de9217
fix typo 2018-02-21 10:19:35 -06:00
Andrew Bauer f8000d7438
Update startpackpack.sh 2018-02-21 10:16:35 -06:00
Andrew Bauer ebc6bf0dcc move debian tweaks to startpackpack.sh 2018-02-21 09:56:19 -06:00
Andrew Bauer 1ace6861c8
raspbian support to buildsystem 2018-02-19 11:30:27 -06:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Andrew Bauer 32bf57d35b docker support files moved to zmdockerfiles 2018-01-19 15:15:11 -06:00
Andy Bauer 95edf1b2a8 fix typo 2018-01-18 09:35:04 -06:00
Andy Bauer 2e4a20dfba entrypoint.sh - add multi-distro compatibility 2018-01-18 09:08:09 -06:00
Andrew Bauer 8c8c257799
log folder check moved to zmlinkcontent.sh 2018-01-17 08:18:41 -06:00
Andrew Bauer 0305dfea92
Update entrypoint.sh 2018-01-16 20:47:23 -06:00
Andrew Bauer 530e10610e
Update entrypoint.sh 2018-01-16 20:14:42 -06:00