Various CI fixes

phusion · Oct 13, 2024 · 97651ad · 97651ad
1 parent 9c5bb29
commit 97651ad
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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