Skip to content

Commit

Permalink
Merge pull request #288 from DataDog/paulcacheux/fix-ci-again
Browse files Browse the repository at this point in the history
fix virtualbox not found in CI
  • Loading branch information
paulcacheux authored May 21, 2024
2 parents 20a6d94 + 3d69f4b commit 0df18a3
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
26 changes: 26 additions & 0 deletions .github/vagrant.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From f67d4f75eb2d97601df3cfe491ed4594422f190b Mon Sep 17 00:00:00 2001
From: Paul Cacheux <[email protected]>
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ jobs:
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
- name: Download the nikos artifact
uses: actions/download-artifact@v4
with:
Expand Down

0 comments on commit 0df18a3

Please sign in to comment.