From 366294ef548b8ec68e9319922740d4269daef7b1 Mon Sep 17 00:00:00 2001 From: Paul Cacheux Date: Mon, 11 Nov 2024 09:30:05 +0100 Subject: [PATCH] bump virtualbox and vagrant and remove patch --- .github/vagrant.patch | 26 -------------------------- .github/workflows/ci.yml | 6 +----- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 .github/vagrant.patch diff --git a/.github/vagrant.patch b/.github/vagrant.patch deleted file mode 100644 index 03dd371f..00000000 --- a/.github/vagrant.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f67d4f75eb2d97601df3cfe491ed4594422f190b Mon Sep 17 00:00:00 2001 -From: Paul Cacheux -Date: Mon, 20 May 2024 14:50:01 +0200 -Subject: [PATCH] virtualbox version detection: handle WARNING lines - ---- - plugins/providers/virtualbox/driver/meta.rb | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb -index 63af500c65a..413574e4125 100644 ---- a/plugins/providers/virtualbox/driver/meta.rb -+++ b/plugins/providers/virtualbox/driver/meta.rb -@@ -197,7 +197,11 @@ def read_version - end - end - -- parts = output.split("_") -+ version_line = output.each_line.find do |line| -+ !line.start_with?("WARNING:") -+ end -+ -+ parts = version_line.split("_") - return nil if parts.empty? - parts[0].split("r")[0] - end \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c3db5b3..0879b94b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,11 +95,7 @@ jobs: wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor --yes -o /usr/share/keyrings/hashicorp-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list - sudo apt-get update && sudo apt-get install gcc-12 virtualbox-7.0 vagrant - - - name: Patch vagrant - run: | - sudo patch -p1 -d /opt/vagrant/embedded/gems/gems/vagrant-2.4.1/ < .github/vagrant.patch + sudo apt-get update && sudo apt-get install gcc-12 virtualbox-7.1 vagrant - name: Download the nikos artifact uses: actions/download-artifact@v4