mirror of
https://github.com/vagrant-libvirt/vagrant-libvirt.git
synced 2025-02-25 18:55:27 -06:00
Replace remaining stray references with main (#1582)
Ensure default branch has been fully updated everywhere to main, which should fix the running of the unit and integration tests on the main branch.
This commit is contained in:
parent
7d48c5ec46
commit
602b4e9ad8
2
.github/workflows/docker-image.yml
vendored
2
.github/workflows/docker-image.yml
vendored
@ -3,7 +3,7 @@ name: docker-image
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
tags:
|
tags:
|
||||||
- '*.*.*'
|
- '*.*.*'
|
||||||
pull_request:
|
pull_request:
|
||||||
|
2
.github/workflows/integration-tests.yml
vendored
2
.github/workflows/integration-tests.yml
vendored
@ -3,7 +3,7 @@ name: Integration Tests
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
2
.github/workflows/unit-tests.yml
vendored
2
.github/workflows/unit-tests.yml
vendored
@ -10,7 +10,7 @@ name: CI
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
[](https://gitter.im/vagrant-libvirt/vagrant-libvirt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
[](https://gitter.im/vagrant-libvirt/vagrant-libvirt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||||
[](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml)
|
[](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml)
|
||||||
[](https://coveralls.io/github/vagrant-libvirt/vagrant-libvirt?branch=master)
|
[](https://coveralls.io/github/vagrant-libvirt/vagrant-libvirt?branch=main)
|
||||||
[](https://badge.fury.io/rb/vagrant-libvirt)
|
[](https://badge.fury.io/rb/vagrant-libvirt)
|
||||||
|
|
||||||
This is a [Vagrant](http://www.vagrantup.com) plugin that adds a
|
This is a [Vagrant](http://www.vagrantup.com) plugin that adds a
|
||||||
|
@ -120,7 +120,7 @@ module VagrantPlugins
|
|||||||
logger.debug "In config found network type #{type} options #{original_options}"
|
logger.debug "In config found network type #{type} options #{original_options}"
|
||||||
# Options can be specified in Vagrantfile in short format (:ip => ...),
|
# Options can be specified in Vagrantfile in short format (:ip => ...),
|
||||||
# or provider format # (:libvirt__network_name => ...).
|
# or provider format # (:libvirt__network_name => ...).
|
||||||
# https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/util/scoped_hash_override.rb
|
# https://github.com/mitchellh/vagrant/blob/main/lib/vagrant/util/scoped_hash_override.rb
|
||||||
options = scoped_hash_override(original_options, :libvirt)
|
options = scoped_hash_override(original_options, :libvirt)
|
||||||
# store type in options
|
# store type in options
|
||||||
# use default values if not already set
|
# use default values if not already set
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
# After script has finished, nothing else than halting machine should be done.
|
# After script has finished, nothing else than halting machine should be done.
|
||||||
|
|
||||||
# For more info about creating custom box refer to
|
# For more info about creating custom box refer to
|
||||||
# https://github.com/vagrant-libvirt/vagrant-libvirt/tree/master/example_box
|
# https://github.com/vagrant-libvirt/vagrant-libvirt/tree/main/example_box
|
||||||
|
|
||||||
# We need to set a hostname.
|
# We need to set a hostname.
|
||||||
if [ $# -ne 1 ]; then
|
if [ $# -ne 1 ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user