search

voxpupuli / puppet-virtualbox

A Puppet module to install and manage VirtualBox
https://forge.puppet.com/puppet/virtualbox
Apache License 2.0
5 stars 29 forks source link

Add bionic to the apt::key regexp to support Ubuntu 18.04 #83

Closed meskaya closed 5 years ago

meskaya commented 5 years ago

Pull Request (PR) description

Add bionic in a regexp used with apt::key to install the right repository key for Ubuntu 18.04

This Pull Request (PR) fixes the following issues

Fixes #82
meskaya commented 5 years ago

Yes it should work if we have both the right repo key and the node architecture in the repo source list

alexjfisher commented 5 years ago

@meskaya If you need any help with rebasing and squashing, we’d be happy to see you on IRC (freenode #voxpupuli), or Slack.

Dan33l commented 5 years ago

@meskaya when you are thinking rebase and squash are done locally (before to push) , you can use git log --oneline. This permit to check the history. And so just after the merge of your previous PR, you should find only one line about this PR (not several).

Dan33l commented 5 years ago

Yes ! You did squash of several commits in one commit. From here : 

                  M 
Master branch +---+
                   \
 Feature branch     +---+---+
                        C1  C2

We are now here 

                   M
 Master branch +---+
                    \
 Feature branch      +---+
                         C=C1+C2

But since you cloned Voxpupuli repository our repo moved because we merged your previous PR. So now, you have to rebase and so your master branch will include your previous PR like this : 

                       Here merge of previous PR
                   M   v
 Master branch +---+---+
                        \
 Feature branch          +---+
                             C=C1+C2

So from this history (git log --oneline) : 

9411685 Add bionic to the apt::key regexp to support Ubuntu 18.04
2edd695 [blacksmith] Bump version to 2.2.2-rc0
c612d6a Merge pull request #79 from bastelfreak/rel221
c65499a release 2.2.1
059dff6 Merge pull request #78 from voxpupuli/modulesync

You should get instead : 

9411685 Add bionic to the apt::key regexp to support Ubuntu 18.04   <--- Here this PR
146f396 Merge pull request #81 from meskaya/architecture            <--- Here merge of previous PR
fcd736e Add node architecture to the apt repository
2edd695 [blacksmith] Bump version to 2.2.2-rc0
c612d6a Merge pull request #79 from bastelfreak/rel221
c65499a release 2.2.1
059dff6 Merge pull request #78 from voxpupuli/modulesync
meskaya commented 5 years ago

Is the code I pushed ok ?