Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cmake] use a CMake variable for MULTIPASS_UPSTREAM #1377

Merged
merged 1 commit into from
Feb 21, 2020
Merged

[cmake] use a CMake variable for MULTIPASS_UPSTREAM #1377

merged 1 commit into from
Feb 21, 2020

Conversation

Saviq
Copy link
Collaborator

@Saviq Saviq commented Feb 21, 2020

Rather than reading straight from the environment.

Working in real life:
#1375 (comment)

Testing:

  1. MULTIPASS_UPSTREAM is required on a release/* branch

    $ git checkout -b release/0.0
$ cmake . -UMULTIPASS_UPSTREAM
# ...
CMake Error at CMakeLists.txt:87 (message):
  You need to set MULTIPASS_UPSTREAM for a release build.

  Use an empty string to make local the authoritative repository.

  2. setting MULTIPASS_UPSTREAM=origin makes it ignore the release/* branch

    $ git checkout -b release/0.0
$ cmake . -DMULTIPASS_UPSTREAM=origin
# ...
-- Setting version to: 1.1.0-dev.84+g4a33a0a9
$ git tag -as v0.0.0 -m Foo
$ cmake . -DMULTIPASS_UPSTREAM=origin
# ...
-- Setting version to: 1.1.0-dev.84+g4a33a0a9
$ git tag -d v0.0.0

  3. setting MULTIPASS_UPSTREAM= makes it respect the release/* branch

    $ git checkout -b release/0.0
$ cmake . -DMULTIPASS_UPSTREAM=
# ...
-- Setting version to: 1.1.0-rc.84+g4a33a0a9
$ git tag -as v0.0.0 -m Foo
$ cmake . -DMULTIPASS_UPSTREAM=
# ...
-- Setting version to: 0.0.0
$ git tag -d v0.0.0

@Saviq
[cmake] use a CMake variable for MULTIPASS_UPSTREAM
62ef073 
Rather than reading straight from the environment.
@Saviq Saviq requested a review from ricab February 21, 2020 09:47
@multipass-ci-bot
Copy link
Collaborator

multipass-ci-bot commented Feb 21, 2020 •
edited
Loading

macOS build available: multipass-1.1.0-dev.617.pr1377+g4bae1c3b.mac-Darwin.pkg
Snap build available: snap refresh multipass --channel edge/pr1377 or multipass_1.1.0-dev.90.pr1377+g33c7df7_amd64.snap

@codecov
Copy link

codecov bot commented Feb 21, 2020 •
edited
Loading

Codecov Report

Merging #1377 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1377   +/-   ##
=======================================
  Coverage   73.19%   73.19%           
=======================================
  Files         208      208           
  Lines        7550     7550           
=======================================
  Hits         5526     5526           
  Misses       2024     2024

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 68a5af1...62ef073. Read the comment docs.

ricab
ricab approved these changes Feb 21, 2020
View reviewed changes
Copy link
Collaborator

@ricab ricab left a comment

Choose a reason for hiding this comment

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

Yep

bors r+

@bors
Copy link
Contributor

bors bot commented Feb 21, 2020

Build succeeded

@bors bors bot merged commit 81b7441 into master Feb 21, 2020
@bors bors bot deleted the fix-cmake-version-upstream branch February 21, 2020 10:40
Saviq added a commit that referenced this pull request Feb 21, 2020
@bors @Saviq
Merge #1377
edb19f5 
1377: [cmake] use a CMake variable for MULTIPASS_UPSTREAM r=ricab a=Saviq

Rather than reading straight from the environment.



Co-authored-by: Michał Sawicz <[email protected]>
@loop-evgeny loop-evgeny mentioned this pull request Jan 23, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ricab ricab ricab approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Saviq @multipass-ci-bot @ricab