From 0d303aab16a759aa60443e380273134e477dc2d0 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Sat, 14 Oct 2023 01:32:55 -0400 Subject: [PATCH] Disable snap --- .github/workflows/publish-snap.yml | 98 +++++++++++++++--------------- README.md | 24 -------- 2 files changed, 49 insertions(+), 73 deletions(-) diff --git a/.github/workflows/publish-snap.yml b/.github/workflows/publish-snap.yml index 4ee4cfa2..b352c837 100644 --- a/.github/workflows/publish-snap.yml +++ b/.github/workflows/publish-snap.yml @@ -1,51 +1,51 @@ -name: Publish Snap +# name: Publish Snap -on: - push: - branches: - - master - tags: - - v** +# on: +# push: +# branches: +# - master +# tags: +# - v** -jobs: - build-and-release: - runs-on: ubuntu-latest - strategy: - matrix: - architecture: - - amd64 - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set Swap Space - uses: pierotofy/set-swap-space@master - with: - swap-size-gb: 12 - - name: Build - id: build - uses: diddlesnaps/snapcraft-multiarch-action@v1 - with: - architecture: ${{ matrix.architecture }} - - name: Publish unstable builds to Edge - if: github.ref == 'refs/heads/master' - uses: snapcore/action-publish@v1 - with: - store_login: ${{ secrets.STORE_LOGIN }} - snap: ${{ steps.build.outputs.snap }} - release: edge - - name: Publish tagged prerelease builds to Beta - # These are identified by having a hyphen in the tag name, e.g.: v1.0.0-beta1 - if: startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-') - uses: snapcore/action-publish@v1 - with: - store_login: ${{ secrets.STORE_LOGIN }} - snap: ${{ steps.build.outputs.snap }} - release: beta - - name: Publish tagged stable or release-candidate builds to Candidate - # These are identified by NOT having a hyphen in the tag name, OR having "-RC" or "-rc" in the tag name. - if: startsWith(github.ref, 'refs/tags/v1') && ( ( ! contains(github.ref, '-') ) || contains(github.ref, '-RC') || contains(github.ref, '-rc') ) - uses: snapcore/action-publish@v1 - with: - store_login: ${{ secrets.STORE_LOGIN }} - snap: ${{ steps.build.outputs.snap }} - release: candidate +# jobs: +# build-and-release: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# architecture: +# - amd64 +# steps: +# - name: Checkout +# uses: actions/checkout@v2 +# - name: Set Swap Space +# uses: pierotofy/set-swap-space@master +# with: +# swap-size-gb: 12 +# - name: Build +# id: build +# uses: diddlesnaps/snapcraft-multiarch-action@v1 +# with: +# architecture: ${{ matrix.architecture }} +# - name: Publish unstable builds to Edge +# if: github.ref == 'refs/heads/master' +# uses: snapcore/action-publish@v1 +# with: +# store_login: ${{ secrets.STORE_LOGIN }} +# snap: ${{ steps.build.outputs.snap }} +# release: edge +# - name: Publish tagged prerelease builds to Beta +# # These are identified by having a hyphen in the tag name, e.g.: v1.0.0-beta1 +# if: startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-') +# uses: snapcore/action-publish@v1 +# with: +# store_login: ${{ secrets.STORE_LOGIN }} +# snap: ${{ steps.build.outputs.snap }} +# release: beta +# - name: Publish tagged stable or release-candidate builds to Candidate +# # These are identified by NOT having a hyphen in the tag name, OR having "-RC" or "-rc" in the tag name. +# if: startsWith(github.ref, 'refs/tags/v1') && ( ( ! contains(github.ref, '-') ) || contains(github.ref, '-RC') || contains(github.ref, '-rc') ) +# uses: snapcore/action-publish@v1 +# with: +# store_login: ${{ secrets.STORE_LOGIN }} +# snap: ${{ steps.build.outputs.snap }} +# release: candidate diff --git a/README.md b/README.md index 29037d15..7a200f33 100644 --- a/README.md +++ b/README.md @@ -83,30 +83,6 @@ ODM can be installed natively on Windows. Just download the latest setup from th run C:\Users\youruser\datasets\project [--additional --parameters --here] ``` -## Snap Package - -ODM is now available as a Snap Package from the Snap Store. To install you may use the Snap Store (available itself as a Snap Package) or the command line: - -```bash -sudo snap install --edge opendronemap -``` - -To run, you will need a terminal window into which you can type: - -```bash -opendronemap - -# or - -snap run opendronemap - -# or - -/snap/bin/opendronemap -``` - -Snap packages will be kept up-to-date automatically, so you don't need to update ODM manually. - ## GPU Acceleration ODM has support for doing SIFT feature extraction on a GPU, which is about 2x faster than the CPU on a typical consumer laptop. To use this feature, you need to use the `opendronemap/odm:gpu` docker image instead of `opendronemap/odm` and you need to pass the `--gpus all` flag: