mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
2 103 Commity
12 Gałęzie
61 Tagi
1,1 GiB
Wykres commitów

2103 Commity (a4ad1e2d5702e64c03977c3996afc72df5fc7cb0)

Autor SHA1 Wiadomość Data
Piero Toffanin a4ad1e2d57
Merge branch 'master' into Snap-readme 2020-11-06 10:20:44 -05:00
Piero Toffanin 9f5f453722
Merge pull request #1192 from diddledan/WSL-readme 
Update README.md for WSL instructions
 2020-11-06 10:18:55 -05:00
Piero Toffanin 0876b1db37
Merge pull request #1191 from diddledan/github-actions-ifs 
Fix GitHub Actions
 2020-11-06 10:17:07 -05:00
Piero Toffanin d5dc177220
Merge pull request #1190 from diddledan/mark-snap-stable 
Mark Snap as grade: stable
 2020-11-06 10:16:24 -05:00
Daniel Llewellyn 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
Daniel Llewellyn 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
Daniel Llewellyn 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
Daniel Llewellyn 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
Daniel Llewellyn 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
Daniel Llewellyn 5176b4670e Mark Snap as grade: stable 
Snap packages marked as `grade: devel` are not permitted to be released
to the `candidate` or `stable` channels in the Snap Store. This commit
changes the grade to `stable` now that everything seems to be working
well. Snaps build from this commit forward will be releasable to the
`candidate` and/or `stable` channels in the Snap Store :-)

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-05 23:00:39 +00:00
Piero Toffanin 0a5c4bae78
Merge pull request #1188 from diddledan/fix-environment-vars 
Fix PYTHONPATH environment var in Dockerfiles
 2020-11-05 16:27:27 -05:00
Daniel Llewellyn 474000503c Fix PYTHONPATH environment var in Dockerfiles 
My previous evolution of the Dockerfiles grouped the `ENV` entries into
a single definition to reduce the number of intermediate Docker image
layers. Unfortunately I didn't account for the duplicate `PYTHONPATH`
definition so only the second was being applied correctly. This commit
fixes that.

* Combine multiple `ENV PYTHONPATH=` to a single definition.

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-05 21:22:08 +00:00
Piero Toffanin 633049b4ef
Merge pull request #1187 from diddledan/fix-libusb-dependency 
Fix incorrect libusb APT package version
 2020-11-05 12:49:16 -05:00
Piero Toffanin ca2cc4d260
Merge pull request #1186 from diddledan/bump-scipy 
Bump scipy dependency version
 2020-11-05 12:45:17 -05:00
Daniel Llewellyn 788360cb82 Fix incorrect libusb APT package version 
* Update dependency on libusb to use `libusb1.0` instead of
  `libusb0.1-4`

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-05 17:32:35 +00:00
Daniel Llewellyn b8860c75ab Bump scipy dependency version 
Part of porting to Ubuntu 20.04, we need a more recent scipy:

* Update scipy to 1.5.4

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-05 17:29:42 +00:00
Piero Toffanin d9c498e5ec
Merge pull request #1172 from pierotofy/210 
Update OpenSfM
 2020-11-03 16:33:16 -05:00
Piero Toffanin f61af3e677 Fix int <==> float mismatch 2020-11-03 18:03:03 +00:00
Piero Toffanin 1ddc492c8c Filter p points in openmvs 2020-11-03 17:07:20 +00:00
Piero Toffanin f110f061c4 merged master 2020-11-03 16:46:06 +00:00
Piero Toffanin c3362573e4
Merge pull request #1184 from diddledan/fix-workflow 
Fix snapcraftbuild
 2020-11-03 10:48:11 -05:00
Daniel Llewellyn 337f2931ee Fix snapcraftbuild 
I _think_ this fixes the yaml parser error from GitHub Actions (ref: https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#example-expression-in-an-if-conditional)

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-03 15:31:08 +00:00
Piero Toffanin 9bbf069aa0 Fix CGAL name 2020-11-02 21:59:54 +00:00
Piero Toffanin 4537824e94 Added missing stage-packages key 2020-11-02 21:42:51 +00:00
Piero Toffanin 0e803b9233 Add openmvs deps in snapcraft 2020-11-02 21:26:48 +00:00
Piero Toffanin e271169cc6
Remove badges 2020-11-02 16:17:36 -05:00
Piero Toffanin d18d6550e8
Update badges 2020-11-02 16:16:08 -05:00
Piero Toffanin 7a2520cd1a
Fix YAML indentation 2020-11-02 16:12:58 -05:00
Piero Toffanin 314c75ae9a Merged master 2020-11-02 21:04:32 +00:00
Piero Toffanin 4af4e4007b Get OpenMVS from ODM repo 2020-11-02 15:58:25 -05:00
Piero Toffanin 73cd2ecccc
Merge pull request #1183 from diddledan/update-snapcraft-workflow 
Update snapcraftbuild workflow
 2020-11-02 14:58:07 -05:00
Piero Toffanin 1756ae4cc6
Merge pull request #1182 from diddledan/WSL-build 
WSL build
 2020-11-02 14:56:31 -05:00
Daniel Llewellyn 149baa436d Fix if: lines in snapcraftbuild workflow 
* Incorrect syntax for expressions used in `if:` tests in `snapcraftbuild.yml` workflow

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-02 19:11:19 +00:00
Daniel Llewellyn d49f22c898 Update snapcraftbuild workflow 
* Use newly published action: `diddlesnaps/snapcraft-multiarch-action`
* Upload every push to master to the Snap Store's Edge channel
* Upload every tagged prerelease to the Snap Store's Beta channel
  (including release candidates which are also handled below)
* Upload every tagged stable or release candidate release to the Snap
  Store's Candidate Channel

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-02 19:05:21 +00:00
Daniel Llewellyn 41819dccb9 Add build and release workflow 
* Add build and release workflow to build a Docker container and WSL rootfs tarball.
* Upload the Docker container to Docker Hub.
* Upload the WSL rootfs tarball to GitHub Releases.

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-02 18:38:06 +00:00
Daniel Llewellyn 91a82b0f82 Add test build workflow 
* Add a GitHub Actions workflow to test that PRs can successfully build

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-02 18:36:25 +00:00
Daniel Llewellyn 9ea1eb6e28 Update build scripts 
* Use `snapcraft.yaml` as the source-of-truth for APT dependencies to reduce burden of maintianing multiple lists

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
 2020-11-02 18:35:32 +00:00
Piero Toffanin 50a60a9617 Check for invalid GCP entries 2020-11-02 11:17:44 -05:00
Piero Toffanin 253d76314a Catch errors in cropping, handle image masks 2020-11-02 11:13:23 -05:00
Piero Toffanin 45cf58abb4
Merge pull request #1181 from Saijin-Naib/master 
Dan's magic GitHub Action
 2020-11-02 10:39:02 -05:00
Saijin-Naib 1c37ad497a
Update README.md 
Fixed build status badge for where it should live once merged
 2020-10-30 23:34:27 -04:00
Saijin-Naib e307b43d5e
Update snapcraft.yaml 
Fixed SNAP package naming
 2020-10-30 23:33:19 -04:00
Saijin-Naib 1ee4c27d05
Update snapcraftbuild.yml 
Fixes from Dan
 2020-10-29 16:08:45 -04:00
Saijin-Naib 38ae450deb
Update snapcraftbuild.yml 
Dan's rebase on snapcore's action
 2020-10-29 16:00:23 -04:00
Saijin-Naib ff3c44d780
Update snapcraftbuild.yml 
Fixes from Dan
 2020-10-29 15:46:47 -04:00
Saijin-Naib f22b44f99d
Update README.md 2020-10-29 15:15:24 -04:00
Saijin-Naib 3b428f5dd9
Update snapcraftbuild.yml 2020-10-29 14:54:03 -04:00
Saijin-Naib 8f88b2903f
Update snapcraftbuild.yml 2020-10-29 14:50:55 -04:00
Saijin-Naib 138cb53cb7
Update snapcraftbuild.yml 2020-10-29 14:48:35 -04:00
Saijin-Naib ec81cf6a07
Update snapcraftbuild.yml 2020-10-29 14:46:21 -04:00