Skip to content

Commit

Permalink
[snap] default to MULTIPASS_UPSTREAM="origin"
Browse files Browse the repository at this point in the history
  • Loading branch information
@Saviq
Saviq committed Mar 4, 2020
1 parent bf45806 commit 4475d34
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ env:
# regexes for release branch and tag
- MULTIPASS_RELEASE_BRANCH_PATTERN="^release/([0-9\.]+)$"
- MULTIPASS_RELEASE_TAG_PATTERN="^v([0-9]+\.[0-9]+)\.[0-9]+$"
# upstream to use as reference for release version matching
- MULTIPASS_UPSTREAM="origin"
# build label added to the version string
- MULTIPASS_BUILD_LABEL=""
# whether to publish the built packages
Expand Down Expand Up @@ -135,7 +133,6 @@ jobs:

# inject build identifier and upstream
- sed -i "/configflags:/a \ - -DMULTIPASS_BUILD_LABEL=${MULTIPASS_BUILD_LABEL}" snap/snapcraft.yaml
- sed -i "/configflags:/a \ - -DMULTIPASS_UPSTREAM=${MULTIPASS_UPSTREAM}" snap/snapcraft.yaml

script:
- sg lxd -c '/snap/bin/snapcraft --use-lxd'
Expand Down
1 change: 1 addition & 0 deletions snap/snapcraft.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ parts:
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
- -DCMAKE_INSTALL_PREFIX=/
- -DMULTIPASS_ENABLE_TESTS=off
- -DMULTIPASS_UPSTREAM=origin
override-build: |
snapcraftctl build
set -e
Expand Down

1 comment on commit 4475d34

@multipass-ci-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Snap build available: snap refresh multipass --channel candidate/1.1

Please sign in to comment.