From 9ddaccc16412d74bf4845dd9c093b65de2f36617 Mon Sep 17 00:00:00 2001 From: Josh Day Date: Wed, 12 Jul 2023 10:51:45 -0400 Subject: [PATCH] try to fix ci... --- .github/workflows/julia-tests.yaml | 4 ++-- src/SimulationService.jl | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/julia-tests.yaml b/.github/workflows/julia-tests.yaml index c4923cf..615e19a 100644 --- a/.github/workflows/julia-tests.yaml +++ b/.github/workflows/julia-tests.yaml @@ -2,8 +2,6 @@ # Julia Tests name: Correctness - Julia -env: - JULIA_NUM_THREADS: 2 on: push: branches: ['main'] @@ -12,6 +10,8 @@ on: jobs: test: + env: + JULIA_NUM_THREADS: 2 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/src/SimulationService.jl b/src/SimulationService.jl index 08703e1..0152e3d 100644 --- a/src/SimulationService.jl +++ b/src/SimulationService.jl @@ -71,7 +71,6 @@ end #-----------------------------------------------------------------------------# start! function start!(; host=SIMSERVICE_HOST, port=SIMSERVICE_PORT, kw...) - Threads.nthreads() > 1 || error("Server require `Thread.nthreads() > 1`. Start Julia via `julia --threads=auto`.") SIMSERVICE_ENABLE_TDS || @warn "TDS is disabled. Some features will not work." stop!() # Stop server if it's already running server_url[] = "http://$host:$port" @@ -91,7 +90,12 @@ function start!(; host=SIMSERVICE_HOST, port=SIMSERVICE_PORT, kw...) # Oxygen.mergeschema(swagger) # server: - Oxygen.serveparallel(; host, port, async=true, kw...) + if Threads.nthreads() > 1 # true in production + Oxygen.serveparallel(; host, port, async=true, kw...) + else + @warn "Server starting single-threaded. This should only be used for testing. Try starting Julia via `julia --threads=auto`." + Oxygen.serve(; host, port, async=true, kw...) + end end #-----------------------------------------------------------------------------# stop!