786833d185
Merge pull request #1201 from pierotofy/221
...
Improved orthophotos, added --pc-quality flag
2020-11-15 00:34:39 -05:00
f90960c8d4
Merge pull request #1203 from diddledan/disable-386-snapbuild
...
Disable attempts to build Snap for i386
2020-11-13 09:47:24 -05:00
c109f039b0
Merge pull request #1202 from diddledan/missing-python-stuff
...
Update to add some missing python packages in Snap
2020-11-13 09:46:34 -05:00
ca98ff6d1d
Disable attempts to build Snap for i386
...
Ubuntu 20.04 Does not support i386, so attempting to build the Snap for
i386 will either fail or be non-runnable on an i386 Linux distro.
* Disable i386 build in `snapcraftbuild.yml` GitHub Action workflow
* Disable i386 build when testing PRs for consistency
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-13 03:29:14 +00:00
c05035df80
Update to add some missing python packages in Snap
...
I think this was caused by the release of Snapcraft 4.4 recently which
might have different behaviour. The snap is missing a few python
packages/modules now, which were present when building earlier.
* Add missing Python packages
* Ensure libblas and liblapack can be found with an LD_LIBRARY_PATH
override.
* Rename reference to `python3.6` to `python3.8`.
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-13 03:15:49 +00:00
6aef1de935
Fix mvstex bug referencing old config parameter
2020-11-12 19:38:13 -05:00
489ab390a4
Remove CPP from codeql
2020-11-12 10:32:07 -05:00
4ef3fc29a3
Merge branch 'master' of https://github.com/OpenDroneMap/ODM into 221
2020-11-12 10:31:12 -05:00
c6613910b3
Updated mvs-texturing, added --pc-quality flag, removed --texturing-nadir-weight
2020-11-12 10:23:02 -05:00
8e31d0e992
Merge pull request #1200 from Saijin-Naib/master
...
Update Dependencies as identified by CodeQL and DependaBot
2020-11-11 16:50:07 -05:00
8a867e0e2e
Merge pull request #1 from Saijin-Naib/dependabot/pip/pyyaml-5.1
...
Bump pyyaml from 3.13 to 5.1
2020-11-11 16:03:38 -05:00
1261901048
Merge pull request #2 from Saijin-Naib/dependabot/pip/pillow-7.1.0
...
Bump pillow from 6.1.0 to 7.1.0
2020-11-11 16:03:26 -05:00
0b68e0b834
Merge pull request #3 from Saijin-Naib/dependabot/pip/cryptography-3.2
...
Bump cryptography from 2.8 to 3.2
2020-11-11 16:03:16 -05:00
22af7a8ae6
Merge pull request #4 from Saijin-Naib/dependabot/pip/psutil-5.6.6
...
Bump psutil from 5.6.3 to 5.6.6
2020-11-11 16:03:07 -05:00
cfad524cd3
Bump psutil from 5.6.3 to 5.6.6
...
Bumps [psutil](https://github.com/giampaolo/psutil ) from 5.6.3 to 5.6.6.
- [Release notes](https://github.com/giampaolo/psutil/releases )
- [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst )
- [Commits](https://github.com/giampaolo/psutil/compare/release-5.6.3...release-5.6.6 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-11-11 20:59:27 +00:00
f67eb7c7ea
Bump cryptography from 2.8 to 3.2
...
Bumps [cryptography](https://github.com/pyca/cryptography ) from 2.8 to 3.2.
- [Release notes](https://github.com/pyca/cryptography/releases )
- [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pyca/cryptography/compare/2.8...3.2 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-11-11 20:59:25 +00:00
8d8c785ba9
Bump pillow from 6.1.0 to 7.1.0
...
Bumps [pillow](https://github.com/python-pillow/Pillow ) from 6.1.0 to 7.1.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases )
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst )
- [Commits](https://github.com/python-pillow/Pillow/compare/6.1.0...7.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-11-11 20:59:24 +00:00
87e38d4ef9
Bump pyyaml from 3.13 to 5.1
...
Bumps [pyyaml](https://github.com/yaml/pyyaml ) from 3.13 to 5.1.
- [Release notes](https://github.com/yaml/pyyaml/releases )
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES )
- [Commits](https://github.com/yaml/pyyaml/compare/3.13...5.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-11-11 20:59:23 +00:00
a82c9f1ee5
Create codeql-analysis.yml
2020-11-11 15:58:55 -05:00
087e03171f
Merge pull request #1199 from diddledan/docker-build
...
Update build-container-and-wsl.yaml workflow
2020-11-10 09:13:54 -05:00
6efe414f09
Update build-container-and-wsl.yaml workflow
...
* Swap `tag_match` for `tag-match-latest` (`tag_match` was incorrect `_`
vs `-` anyway)
* Add master branch to builds - this should build master on any merge or
commit and release the Docker image to an `edge` tag. (See [`tag-edge:
true`](https://github.com/crazy-max/ghaction-docker-meta/#inputs ))
* Add `upload-artifact` to save the WSL rootfs when building a branch
(master).
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-10 13:51:02 +00:00
1bca303e26
Fix push and load may not be set together at the moment
2020-11-09 19:24:11 -05:00
34dc879002
Update VERSION
2020-11-09 19:07:54 -05:00
cc50f32bca
Remove i386 from test build PR workflow
2020-11-09 12:15:53 -05:00
ba778a22c4
Merge branch 'master' of https://github.com/OpenDroneMap/ODM into master
2020-11-08 22:59:42 -05:00
a2bc49009f
Update OpenSfM, add warning filter
2020-11-08 22:59:24 -05:00
dc0e699c0b
Merge pull request #1198 from diddledan/fix-race-condition
...
Fix Buildtime Race Condition
2020-11-08 22:47:42 -05:00
f81be82516
Merge branch 'master' into fix-race-condition
2020-11-09 01:17:20 +00:00
f5a596c6e4
Fix race condition build issue with lasmerge
2020-11-08 16:43:19 -05:00
01057ce051
Remove 386 from Docker Builds for Ubuntu 20.04
...
Ubuntu 20.04 no-longer includes 386 binary support.
* Remove 386 from Docker builds
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-08 17:45:59 +00:00
d8da003868
Fix Buildtime Race Condition
...
The `mv` in `SuperBuild` for `lasmerge` will copy `lasmerge` to a file
called `SuperBuild/install/bin` **not**
`SuperBuild/install/bin/lasmerge` when the `bin` folder has not been
created. This is the case when building with 2 jobs (`-j2`) so builds
fail when moving onto OpenCV which requires that `bin` be a directory.
* Change `mv` to more reliable `install` command for `lasmerge`.
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-08 16:58:07 +00:00
835388bba9
Merge branch 'master' of https://github.com/OpenDroneMap/ODM into master
2020-11-08 11:08:00 -05:00
7fa2af9247
Fix start-dev-env.sh script for Ubuntu 20.04
2020-11-08 11:07:49 -05:00
d8f3874d3c
Merge pull request #1195 from diddledan/missing-webp
...
Update snapcraft.yaml for missing webp library
2020-11-07 00:33:42 -05:00
8e50efefa2
Merge pull request #1194 from diddledan/snapcraft-preload
...
Update snapcraft.yaml for core20/snapcraft-preload
2020-11-07 00:32:09 -05:00
2c9d16ae9b
Update snapcraft.yaml for missing webp library
...
Snapcraft complains about missing `libwebpdemux2` when building. This
commit adds it as a runtime dependency to fix the warning.
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-07 01:47:34 +00:00
7e8c7b8acc
Update snapcraft.yaml for core20/snapcraft-preload
...
It seems that snapcraft-preload[1] installs to a different location when
building with core20 vs core18. This meant the snap builds fail with
being unable to find the executable. This commit changes the reference
to the preload script in the `snapcraft.yaml` to the core20-built
location.
[1] https://github.com/sergiusens/snapcraft-preload
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-07 00:55:15 +00:00
8ae6531923
Bump version
2020-11-06 17:18:20 -05:00
30e5178cd2
Add missing python path
2020-11-06 20:13:51 +00:00
5ec9229736
Merge pull request #1189 from diddledan/ubuntu-20.04
...
Update builds for Ubuntu 20.04
2020-11-06 15:11:14 -05:00
e0b80d1e84
Merge pull request #1193 from diddledan/Snap-readme
...
Update README.md for Snap Package
2020-11-06 10:20:55 -05:00
a4ad1e2d57
Merge branch 'master' into Snap-readme
2020-11-06 10:20:44 -05:00
9f5f453722
Merge pull request #1192 from diddledan/WSL-readme
...
Update README.md for WSL instructions
2020-11-06 10:18:55 -05:00
0876b1db37
Merge pull request #1191 from diddledan/github-actions-ifs
...
Fix GitHub Actions
2020-11-06 10:17:07 -05:00
d5dc177220
Merge pull request #1190 from diddledan/mark-snap-stable
...
Mark Snap as grade: stable
2020-11-06 10:16:24 -05:00
923c80c6e3
Hopefully fix GitHub Actions (again)
...
The GitHub Actions YAML parser doesn't like the `if:` constructs, which
means I probably got them wrong. This is an attempt to fix that.
2020-11-06 10:59:39 +00:00
20cc5d4181
Update README.md for Snap Package
...
* Add installation instructions
* Add running instructions
* Add note about snaps being always up-to-date
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-06 00:17:06 +00:00
c626fb014a
Update README.md
...
* Add link to official Microsoft instructions for installing WSL
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-06 00:09:52 +00:00
26f31118e9
Update README.md for WSL instructions
...
* Add details on how to import the `rootfs.tar.gz` file into WSL
* Add instructions to update the WSL rootfs
* Add uninstallation instructions
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-06 00:08:00 +00:00
601ee670de
Update test-build-prs GitHub Workflow
...
Incorrect name `on.pull-request` should be `on.pull_request`.
Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-05 23:21:36 +00:00
Piero Toffanin