From 97651adc26ab91c13e2f59322860230b92a14d38 Mon Sep 17 00:00:00 2001
From: Hongli Lai <hongli@phusion.nl>
Date: Sun, 13 Oct 2024 14:53:25 +0200
Subject: [PATCH] Various CI fixes

---
 .github/workflows/binaries.yml        | 3 +--
 .github/workflows/debian.yml          | 3 ++-
 .github/workflows/rpm.yml             | 3 ++-
 test/integration_tests/nginx_tests.rb | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
index 1548a5e6e5..b701c3a0be 100644
--- a/.github/workflows/binaries.yml
+++ b/.github/workflows/binaries.yml
@@ -1,7 +1,6 @@
 name: Passenger generic binaries CI
 
 env:
-  ENTERPRISE: 0
   FORCE_COLOR: 1
   RUST_LOG_STYLE: always
 
@@ -188,7 +187,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: binaries-macos-${{ matrix.arch }}
-          path: 'output/**/*'
+          path: packaging/binaries/macos/output/**/*
 
 
       - name: Package binaries
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index c193ddf211..93ecc940b0 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -1,7 +1,8 @@
 name: Passenger Debian packaging tests
 
 env:
-  ENTERPRISE: 0
+  FORCE_COLOR: 1
+  RUST_LOG_STYLE: always
 
 on:
   push: {}
diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
index aac0f59c2d..fa2561acb0 100644
--- a/.github/workflows/rpm.yml
+++ b/.github/workflows/rpm.yml
@@ -1,7 +1,8 @@
 name: Passenger RPM packaging tests
 
 env:
-  ENTERPRISE: 0
+  FORCE_COLOR: 1
+  RUST_LOG_STYLE: always
 
 on:
   push: {}
diff --git a/test/integration_tests/nginx_tests.rb b/test/integration_tests/nginx_tests.rb
index 947b5ba5b2..797220c3d3 100644
--- a/test/integration_tests/nginx_tests.rb
+++ b/test/integration_tests/nginx_tests.rb
@@ -488,7 +488,7 @@ def rename_entrypoint_file
         PhusionPassenger.on_event(:oob_work) do
           f = File.open("#{@stub.full_app_root}/oob_work.\#{$$}", 'w')
           f.close
-          sleep 1
+          sleep 3
         end
         app = lambda do |env|
           if env['PATH_INFO'] == '/oobw'
@@ -515,7 +515,7 @@ def rename_entrypoint_file
       t0 = Time.now
       get("/oobw")
       secs = Time.now - t0
-      secs.should <= 0.1
+      secs.should <= 0.5
     end
   end