Wykres commitów

2163 Commity (a8a9ee00631e9c48c860e197fdd979fca01ca334)

Autor SHA1 Wiadomość Data
Piero Toffanin 7fa2af9247 Fix start-dev-env.sh script for Ubuntu 20.04 2020-11-08 11:07:49 -05:00
Piero Toffanin d8f3874d3c
Merge pull request #1195 from diddledan/missing-webp
Update snapcraft.yaml for missing webp library
2020-11-07 00:33:42 -05:00
Piero Toffanin 8e50efefa2
Merge pull request #1194 from diddledan/snapcraft-preload
Update snapcraft.yaml for core20/snapcraft-preload
2020-11-07 00:32:09 -05:00
Daniel Llewellyn 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
Daniel Llewellyn 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
Piero Toffanin 8ae6531923 Bump version 2020-11-06 17:18:20 -05:00
Piero Toffanin 30e5178cd2 Add missing python path 2020-11-06 20:13:51 +00:00
Piero Toffanin 5ec9229736
Merge pull request #1189 from diddledan/ubuntu-20.04
Update builds for Ubuntu 20.04
2020-11-06 15:11:14 -05:00
Piero Toffanin e0b80d1e84
Merge pull request #1193 from diddledan/Snap-readme
Update README.md for Snap Package
2020-11-06 10:20:55 -05:00
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
Daniel Llewellyn ff5f3ff362 Update builds for Ubuntu 20.04
* Adjust `PYTHONPATH` in Dockerfiles to newer `python3.8`
* Switch to 20.04 base images in Dockerfiles
* Switch snapcraft to use `base20`
* Update APT dependency versions in `snapcraft.yaml` to match those
  available in Ubuntu 20.04
* Bump `pyproj` from version `2.2.2` to `3.0.0`
* Bump `numpy` from version `1.19.2` to `1.19.4`
* Add missing exclusions to `snapcraft.yaml` to reduce the size of snap
  packages
* Add missing exclusions to Dockerfiles to reduce the size of container
  images
* Update `configure.sh` to account for Ubuntu 20.04 instead of 18.04
* Nit: make `configure.sh` executable directly with `./configure.sh`
  instead of `bash configure.sh`

Signed-off-by: Daniel Llewellyn <daniel@snapcraft.ninja>
2020-11-05 22:52:59 +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