From f287b590161be8e77265c1c044705671623df2ee Mon Sep 17 00:00:00 2001
From: Jamil Bou Kheir <jamil@elbii.com>
Date: Tue, 14 Sep 2021 03:10:42 +0000
Subject: [PATCH] firezone omnibus

---
 .github/workflows/ci.yml            | 3 +++
 omnibus/config/projects/firezone.rb | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 89812f81e..ee96fa30a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,6 +73,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: |
+          # XXX: This is required because Omnibus tries to create the install_dir
+          # here even if it already exists.
+          sudo chown vagrant:vagrant /opt
           cd omnibus
           bundle install --binstubs
           bin/omnibus build firezone
diff --git a/omnibus/config/projects/firezone.rb b/omnibus/config/projects/firezone.rb
index fedf9d53c..2cf2a5122 100644
--- a/omnibus/config/projects/firezone.rb
+++ b/omnibus/config/projects/firezone.rb
@@ -27,10 +27,6 @@ DESC
 
 # Defaults to C:/firezone on Windows
 # and /opt/firezone on all other platforms
-if ENV["CI"]
-  default_root "/opt/runner"
-end
-
 install_dir "#{default_root}/#{name}"
 
 build_version Omnibus::BuildVersion.semver